Added README.rst, closes #331

Updated tests workflow badge link
Merge branch 'master' of github.com:RhetTbull/osxphotos
2021-01-08 07:04:07 -08:00 · 2021-01-08 06:41:05 -08:00 · 2021-01-08 06:36:07 -08:00 · 2021-01-08 06:35:56 -08:00 · 2021-01-08 06:26:51 -08:00 · 2021-01-08 06:23:25 -08:00
216 changed files with 4262 additions and 662 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -6,7 +6,8 @@
  "files": [
    "README.md"
  ],
-  "imageSize": 100,
+  "imageSize": 75,
+  "badgeTemplate": "[![All Contributors](https://img.shields.io/badge/all_contributors-<%= contributors.length %>-orange.svg?style=flat)](#contributors)",
  "commit": true,
  "commitConvention": "none",
  "contributors": [
@@ -118,7 +119,26 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "synox",
+      "name": "Aravindo Wingeier",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/2250964?v=4",
+      "profile": "https://github.com/synox",
+      "contributions": [
+        "doc"
+      ]
+    },
+    {
+      "login": "kradalby",
+      "name": "Kristoffer Dalby",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/98431?v=4",
+      "profile": "https://kradalby.no",
+      "contributions": [
+        "code"
+      ]
    }
  ],
-  "contributorsPerLine": 7
+  "contributorsPerLine": 7,
+  "skipCi": true
 }
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -6,6 +6,7 @@ jobs:
  build:

    runs-on: macOS-latest
+    if: "!contains(github.event.head_commit.message, '[skip ci]')"
    strategy:
      max-parallel: 4
      matrix:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,118 @@ 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.39.10](https://github.com/RhetTbull/osxphotos/compare/v0.39.9...v0.39.10)
+
+> 6 January 2021
+
+- Refactored ExportResults [`568d1b3`](https://github.com/RhetTbull/osxphotos/commit/568d1b36a631df33317dc00f27126b507c90bf51)
+- Improved handling of deleted photos, #332 [`792247b`](https://github.com/RhetTbull/osxphotos/commit/792247b51cc2263221ba8c2e741d2ec454c75ca8)
+- Added error_str to ExportResults [`d78097c`](https://github.com/RhetTbull/osxphotos/commit/d78097ccc0686680baf5fffa91f9e082e44b576e)
+
+#### [v0.39.9](https://github.com/RhetTbull/osxphotos/compare/v0.39.8...v0.39.9)
+
+> 4 January 2021
+
+- Added test for Big Sur 16.0.1 database changes [`7deac58`](https://github.com/RhetTbull/osxphotos/commit/7deac581b1f1fb3dc59885b6e1ab9a63b382408d)
+- Updated all-contributors [`2bf83e4`](https://github.com/RhetTbull/osxphotos/commit/2bf83e4b1fcfadb664ba8988bca4fef7e4c7da12)
+- Added additional warning to _photoinfo_export [`fb5fb8e`](https://github.com/RhetTbull/osxphotos/commit/fb5fb8ebc73f96548975432333dfdf01c4794d51)
+
+#### [v0.39.8](https://github.com/RhetTbull/osxphotos/compare/v0.39.7...v0.39.8)
+
+> 3 January 2021
+
+- Updated README, version [`b93d682`](https://github.com/RhetTbull/osxphotos/commit/b93d6822ac5366c57d9142cba9b809b4ab99ad98)
+
+#### [v0.39.7](https://github.com/RhetTbull/osxphotos/compare/v0.39.6...v0.39.7)
+
+> 3 January 2021
+
+- doc: start with examples before the export reference, thanks to @synox  [`#327`](https://github.com/RhetTbull/osxphotos/pull/327)
+- Added tag_groups arg to ExifTool.asdict(), issue #324 [`2480f2a`](https://github.com/RhetTbull/osxphotos/commit/2480f2a325dbb09689f8c417618b7b9e976bfcb9)
+- doc: start with examples before the export reference [`7c7bf1b`](https://github.com/RhetTbull/osxphotos/commit/7c7bf1be6b6382a995a4e17906adfd8720d0a1c3)
+- Updated dependencies in README.md [`b1cab32`](https://github.com/RhetTbull/osxphotos/commit/b1cab32ff4c7b65ae4c9a5a9a11c175dbd487c0a)
+- remove extra spaces [`a59bb5b`](https://github.com/RhetTbull/osxphotos/commit/a59bb5b02f10fa554dae346a7271be37f50d8bcc)
+- Adding back  dependency https://github.com/RhetTbull/PhotoScript) [`7c8bfc8`](https://github.com/RhetTbull/osxphotos/commit/7c8bfc811ab3a93dabadf1655f7d0e217d6c7b01)
+
+#### [v0.39.6](https://github.com/RhetTbull/osxphotos/compare/v0.39.5...v0.39.6)
+
+> 3 January 2021
+
+- Make readme easier for beginners, thanks to @synox  [`#326`](https://github.com/RhetTbull/osxphotos/pull/326)
+- doc simplify readme [`02ef0f9`](https://github.com/RhetTbull/osxphotos/commit/02ef0f9a254e83a3729a09cea1ae523407074896)
+- Added exception handling/capture for convert-to-jpeg, issue #322 [`05f111a`](https://github.com/RhetTbull/osxphotos/commit/05f111a287e882ed6b451a550a87753501316aba)
+-  Add @synox as a contributor [`83915c6`](https://github.com/RhetTbull/osxphotos/commit/83915c65abb880036f80ebd830eb1e34292f9599)
+
+#### [v0.39.5](https://github.com/RhetTbull/osxphotos/compare/v0.39.4...v0.39.5)
+
+> 3 January 2021
+
+- Cleanup up the readme [`38842ff`](https://github.com/RhetTbull/osxphotos/commit/38842ff9249e6f5b3069a88a759c8df97ddce51c)
+
+#### [v0.39.4](https://github.com/RhetTbull/osxphotos/compare/v0.39.3...v0.39.4)
+
+> 3 January 2021
+
+- Implemented text replacement for templates, issue #316 [`478715a`](https://github.com/RhetTbull/osxphotos/commit/478715a363f5009e4a38148e832bf0ad3c4cc4f8)
+
+#### [v0.39.3](https://github.com/RhetTbull/osxphotos/compare/v0.39.2...v0.39.3)
+
+> 31 December 2020
+
+- Fixed modified template to use creation time if no modificationd date, issue #312 [`2f57abd`](https://github.com/RhetTbull/osxphotos/commit/2f57abd23cabe57bcf667a1713c37689b330a702)
+
+#### [v0.39.2](https://github.com/RhetTbull/osxphotos/compare/v0.39.1...v0.39.2)
+
+> 31 December 2020
+
+- Added --xattr-template, closes #242 [`#242`](https://github.com/RhetTbull/osxphotos/issues/242)
+
+#### [v0.39.1](https://github.com/RhetTbull/osxphotos/compare/v0.39.0...v0.39.1)
+
+> 31 December 2020
+
+- Fixed --exiftool-path bug, issue #311, #313 [`3394c52`](https://github.com/RhetTbull/osxphotos/commit/3394c527682d8fdd2f20f4f778d802dab86b6372)
+
+#### [v0.39.0](https://github.com/RhetTbull/osxphotos/compare/v0.38.22...v0.39.0)
+
+> 30 December 2020
+
+- Added Finder tags, partial implementation for issue #242  [`#310`](https://github.com/RhetTbull/osxphotos/pull/310)
+- Added tests for Finder tags [`29e4245`](https://github.com/RhetTbull/osxphotos/commit/29e424575a522ae03efe5a140be46bfd0a1346c5)
+- Initial implementation for Finder tags [`5885b23`](https://github.com/RhetTbull/osxphotos/commit/5885b23d3249cf91953092a6b1ce967da2667e29)
+- Updated README for finder tags [`f25a299`](https://github.com/RhetTbull/osxphotos/commit/f25a2993097ad7b2b8ab2d1c787db58c0d799a41)
+- Updated requirements.txt [`ea373c4`](https://github.com/RhetTbull/osxphotos/commit/ea373c4197ce1cce00e89157fe560d1366f7e764)
+
+#### [v0.38.22](https://github.com/RhetTbull/osxphotos/compare/v0.38.21...v0.38.22)
+
+> 30 December 2020
+
+- Fixed --exiftool-path bug, issue #308 [`5dccdf7`](https://github.com/RhetTbull/osxphotos/commit/5dccdf7750611c78de5356bb02f6023d4fc382c5)
+
+#### [v0.38.21](https://github.com/RhetTbull/osxphotos/compare/v0.38.20...v0.38.21)
+
+> 29 December 2020
+
+- Fixed --exiftool-path to work with --exiftool-merge-keywords/persons [`3872e7a`](https://github.com/RhetTbull/osxphotos/commit/3872e7ae649f42d849de472a7dbf78a241d54407)
+
+#### [v0.38.20](https://github.com/RhetTbull/osxphotos/compare/v0.38.19...v0.38.20)
+
+> 29 December 2020
+
+- Added --exiftool-path to CLI [`4897fc4`](https://github.com/RhetTbull/osxphotos/commit/4897fc4b05cc7a3bea314f9cce8a2163bf3922b2)
+
+#### [v0.38.19](https://github.com/RhetTbull/osxphotos/compare/v0.38.18...v0.38.19)
+
+> 29 December 2020
+
+- Added exiftool signature to JSON output, issue #303 [`fa58af8`](https://github.com/RhetTbull/osxphotos/commit/fa58af8b883da11fdfa723d2da75a600d927d46e)
+
+#### [v0.38.18](https://github.com/RhetTbull/osxphotos/compare/v0.38.17...v0.38.18)
+
+> 28 December 2020
+
+- Added --exiftool-merge-keywords/persons, issue #299, #292 [`b1cb99f`](https://github.com/RhetTbull/osxphotos/commit/b1cb99f83f55128a314d265d4588134cb79026c6)
+
 #### [v0.38.17](https://github.com/RhetTbull/osxphotos/compare/v0.38.16...v0.38.17)

 > 28 December 2020
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 # OSXPhotos
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Python package](https://github.com/RhetTbull/osxphotos/workflows/Python%20package/badge.svg)](https://github.com/RhetTbull/osxphotos/workflows/Python%20package/badge.svg)
+[![tests](https://github.com/RhetTbull/osxphotos/workflows/Tests/badge.svg)](https://github.com/RhetTbull/osxphotos/workflows/Tests/badge.svg)
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-12-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-14-orange.svg?style=flat)](#contributors)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->

 - [OSXPhotos](#osxphotos)
@@ -11,7 +11,8 @@
  * [Supported operating systems](#supported-operating-systems)
  * [Installation instructions](#installation-instructions)
  * [Command Line Usage](#command-line-usage)
-  * [Example uses of the package](#example-uses-of-the-package)
+    + [Command line examples](#command-line-examples)
+    + [Command line reference: export](#command-line-reference-export)
  * [Package Interface](#package-interface)
    + [PhotosDB](#photosdb)
    + [PhotoInfo](#photoinfo)
@@ -40,31 +41,29 @@
  
 ## What is osxphotos?

-OSXPhotos provides the ability to interact with and query Apple's Photos.app library database on MacOS. Using this package you can query the Photos database for information about the photos stored in a Photos library on your Mac--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.
+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.

 ## Supported operating systems

-Only works on MacOS (aka Mac OS X). Tested on MacOS 10.12.6 / Photos 2.0, 10.13.6 / Photos 3.0, MacOS 10.14.5, 10.14.6 / Photos 4.0, MacOS 10.15.1 - 10.15.7 / Photos 5.0.
+Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) until macOS Catalina (10.15.7). 

-Beta support for MacOS 10.16/MacOS 11 Big Sur Beta / Photos 6.0.  Not tested on M1 / Apple silicon Macs.
+| macOS Version     | macOS name | Photos.app version |
+| ----------------- |------------|:-------------------|
+| 10.16             | Big Sur    | 6.0 ⚠️ Beta support, not tested on M1 / Apple silicon Macs. |
+| 10.15.1 - 10.15.7 | Catalina   | 5.0 ✅             |
+| 10.14.5, 10.14.6  | Mojave     | 4.0 ✅             |
+| 10.13.6           | High Sierra| 3.0 ✅             |
+| 10.12.6           | Sierra     | 2.0 ✅             |

-Requires python >= 3.7. 
+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.

-This package will read Photos databases for any supported version on any supported OS 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.
+Requires python >= `3.7`. 


-## Installation instructions
-
-OSXPhotos uses setuptools, thus simply run:
-
-	python3 setup.py install
-
-You can also install directly from [pypi](https://pypi.org/project/osxphotos/):
-
-    pip install osxphotos
-
-I recommend you create a [virtual environment](https://docs.python.org/3/tutorial/venv.html) before installing osxphotos.
+## Installation 
+If you are new to python, I recommend you to install using pipx. See other advanced options below. 

+### Installation using pipx
 If you aren't familiar with installing python applications, I recommend you install `osxphotos` with [pipx](https://github.com/pipxproject/pipx). If you use `pipx`, you will not need to create a virtual environment as `pipx` takes care of this. The easiest way to do this on a Mac is to use [homebrew](https://brew.sh/):

 - Open `Terminal` (search for `Terminal` in Spotlight or look in `Applications/Utilities`)
@@ -73,13 +72,26 @@ If you aren't familiar with installing python applications, I recommend you inst
 - Then type this: `pipx install osxphotos`
 - Now you should be able to run `osxphotos` by typing: `osxphotos`

-**WARNING** The git repo for this project is very large (> 1GB) because it contains multiple Photos libraries used for testing on different versions of MacOS.  If you just want to use the osxphotos package in your own code, I recommend you install the latest version from [PyPI](https://pypi.org/project/osxphotos/) which does not include all the test libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest [release](https://github.com/RhetTbull/osxphotos/releases) or you can install via `pip` 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 `pipx` as described above.
+### Installation using pip
+You can also install directly from [pypi](https://pypi.org/project/osxphotos/):
+
+    pip install osxphotos
+
+### Installation from git repository
+OSXPhotos uses setuptools, thus simply run:
+
+	git clone https://github.com/RhetTbull/osxphotos.git
+	cd osxphotos
+	python3 setup.py install
+
+I recommend you create a [virtual environment](https://docs.python.org/3/tutorial/venv.html) before installing osxphotos.
+
+**WARNING** The git repo for this project is very large (> 1GB) because it contains multiple Photos libraries used for testing on different versions of macOS.  If you just want to use the osxphotos package in your own code, I recommend you install the latest version from [PyPI](https://pypi.org/project/osxphotos/) which does not include all the test libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest [release](https://github.com/RhetTbull/osxphotos/releases) or you can install via `pip` 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 `pipx` as described above.

 ## Command Line Usage

 This package will install a command line utility called `osxphotos` that allows you to query the Photos database.  Alternatively, you can also run the command line utility like this: `python3 -m osxphotos`

-After installing per instructions above, you should be able to run `osxphotos` on the command line:

 ```
 > osxphotos
@@ -114,7 +126,37 @@ Commands:

 To get help on a specific command, use `osxphotos help <command_name>`

-Example: `osxphotos help export`
+### Command line examples
+
+#### export all photos to ~/Desktop/export group in folders by date created
+
+`osxphotos export --export-by-date ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export`
+
+**Note**: Photos library/database path can also be specified using `--db` option:
+
+`osxphotos export --export-by-date --db ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export`
+
+#### find all photos with keyword "Kids" and output results to json file named results.json:
+
+`osxphotos query --keyword Kids --json ~/Pictures/Photos\ Library.photoslibrary >results.json`
+
+#### export photos to file structure based on 4-digit year and full name of month of photo's creation date:
+
+`osxphotos export ~/Desktop/export --directory "{created.year}/{created.month}"`
+
+(by default, it will attempt to use the system library)
+
+#### 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):
+
+`osxphotos export ~/Desktop/export --directory "{created.year}" --keyword-template "{label}" --keyword-template "{media_type}"` 
+
+#### 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
+
+`osxphotos export ~/Desktop/export --directory "{place.name.country,NoCountry}/{created.year}"  --person-keyword --album-keyword --keyword-template "{created.year}" --exiftool --update --verbose`
+
+### Command line reference: export
+
+`osxphotos help export`

 ```
 Usage: osxphotos export [OPTIONS] [PHOTOS_LIBRARY]... DEST
@@ -363,6 +405,8 @@ Options:
                                  (see also --ignore-date-modified);
                                  QuickTime:GPSCoordinates;
                                  UserData:GPSCoordinates.
+  --exiftool-path EXIFTOOL_PATH   Optionally specify path to exiftool; if not
+                                  provided, will look for exiftool in $PATH.
  --exiftool-option OPTION        Optional flag/option to pass to exiftool
                                  when using --exiftool. For example,
                                  --exiftool-option '-m' to ignore minor
@@ -410,6 +454,30 @@ Options:
                                  could specify --description-template
                                  "{descr} exported with osxphotos on
                                  {today.date}" See Templating System below.
+  --finder-tag-template TEMPLATE  Set MacOS Finder tags to TEMPLATE. These
+                                  tags can be searched in the Finder or
+                                  Spotlight with 'tag:tagname' format. For
+                                  example, '--finder-tag-template "{label}"'
+                                  to set Finder tags to photo labels. You may
+                                  specify multiple TEMPLATE values by using '
+                                  --finder-tag-template' multiple times. See
+                                  also '--finder-tag-keywords and Extended
+                                  Attributes below.'.
+  --finder-tag-keywords           Set MacOS Finder tags to keywords; any
+                                  keywords specified via '--keyword-template',
+                                  '--person-keyword', etc. will also be used
+                                  as Finder tags. See also '--finder-tag-
+                                  template and Extended Attributes below.'.
+  --xattr-template ATTRIBUTE TEMPLATE
+                                  Set extended attribute ATTRIBUTE to TEMPLATE
+                                  value. Valid attributes are: 'authors',
+                                  'comment', 'copyright', 'description',
+                                  'findercomment', 'headline', 'keywords'. For
+                                  example, to set Finder comment to the
+                                  photo's title and description: '--xattr-
+                                  template findercomment "{title}; {descr}"
+                                  See Extended Attributes below for additional
+                                  details on this option.
  --directory DIRECTORY           Optional template for specifying name of
                                  output directory in the form
                                  '{name,DEFAULT}'. See below for additional
@@ -420,6 +488,13 @@ Options:
                                  do not include an extension in the FILENAME
                                  template. See below for additional details
                                  on templating system.
+  --strip                         Optionally strip leading and trailing
+                                  whitespace from any rendered templates. For
+                                  example, if --filename template is "{title,}
+                                  {original_name}" and image has no title,
+                                  resulting file would have a leading space
+                                  but if used with --strip, this will be
+                                  removed.
  --edited-suffix SUFFIX          Optional suffix template for naming edited
                                  photos.  Default name for edited photos is
                                  in form 'photoname_edited.ext'. For example,
@@ -512,53 +587,74 @@ option to re-export the entire library thus rebuilding the
 '.osxphotos_export.db' database.


+** Extended Attributes **
+
+Some options (currently '--finder-tag-template', '--finder-tag-keywords',
+'-xattr-template') write additional metadata to extended attributes in the
+file. These options will only work if the destination filesystem supports
+extended attributes (most do). For example, --finder-tag-keyword writes all
+keywords (including any specified by '--keyword-template' or other options) to
+Finder tags that are searchable in Spotlight using the syntax: 'tag:tagname'.
+For example, if you have images with keyword "Travel" then using '--finder-
+tag-keywords' you could quickly find those images in the Finder by typing
+'tag:Travel' in the Spotlight search bar. Finder tags are written to the
+'com.apple.metadata:_kMDItemUserTags' extended attribute. Unlike EXIF
+metadata, extended attributes do not modify the actual file. Most cloud
+storage services do not synch extended attributes. Dropbox does sync them and
+any changes to a file's extended attributes will cause Dropbox to re-sync the
+files.
+
+The following attributes may be used with '--xattr-template':
+
+
+authors        The author, or authors, of the contents of the file.  A list
+               of strings. (com.apple.metadata:kMDItemAuthors)
+comment        A comment related to the file.  This differs from the Finder
+               comment, kMDItemFinderComment.  A string.
+               (com.apple.metadata:kMDItemComment)
+copyright      The copyright owner of the file contents.  A string.
+               (com.apple.metadata:kMDItemCopyright)
+description    A description of the content of the resource.  The
+               description may include an abstract, table of contents,
+               reference to a graphical representation of content or a free-
+               text account of the content.  A string.
+               (com.apple.metadata:kMDItemDescription)
+findercomment  Finder comments for this file.  A string.
+               (com.apple.metadata:kMDItemFinderComment)
+headline       A publishable entry providing a synopsis of the contents of
+               the file.  A string. (com.apple.metadata:kMDItemHeadline)
+keywords       Keywords associated with this file. For example, “Birthday”,
+               “Important”, etc. This differs from Finder tags
+               (_kMDItemUserTags) which are keywords/tags shown in the
+               Finder and searchable in Spotlight using "tag:tag_name".  A
+               list of strings. (com.apple.metadata:kMDItemKeywords)
+
+For additional information on extended attributes see: https://developer.apple
+.com/documentation/coreservices/file_metadata/mditem/common_metadata_attribute
+_keys
+
+
 ** Templating System **

 Several options, such as --directory, allow you to specify a template  which
-will be rendered to substitute template fields with values from the photo.
-For example, '{created.month}' would be replaced with the month name of the
-photo creation date.  e.g. 'November'.
+will be rendered to substitute template fields with values from the photo. For
+example, '{created.month}' would be replaced with the month name of the photo
+creation date.  e.g. 'November'.

 Some options supporting templates may be repeated e.g., --keyword-template
 '{label}'  --keyword-template '{media_type}' to add both labels and media
 types to the  keywords.

-The general format for a template is '{TEMPLATE_FIELD[,[DEFAULT]]}'.  Some
-templates have optional modifiers in form
-'{[[DELIM]+]TEMPLATE_FIELD[(PATH_SEP)][?VALUE_IF_TRUE][,[DEFAULT]]}'
+The general format for a template is '{TEMPLATE_FIELD,DEFAULT}'. The full
+template format is:
+'{DELIM+TEMPLATE_FIELD(PATH_SEP)[OLD,NEW]?VALUE_IF_TRUE,DEFAULT}'

-The ',' and DEFAULT value are optional.  If TEMPLATE_FIELD results in a null
-(empty) value, the default is '_'.   You may specify an alternate default
-value by appending ',DEFAULT' after template_field.  e.g. '{title,no_title}'
-would result in 'no_title' if the photo had no title.  You may include other
-text in the template string outside the {} and use more than  one template
-field, e.g. '{created.year} - {created.month}' (e.g. '2020 - November').
+With a few exceptions (like '{created.strftime}') everything but the
+TEMPLATE_FIELD is optional.

-Some template fields such as 'hdr' are boolean and resolve to True or False.
-These take the form: '{TEMPLATE_FIELD?VALUE_IF_TRUE,VALUE_IF_FALSE}', e.g.
-{hdr?is_hdr,not_hdr} which would result in 'is_hdr' if photo is an HDR  image
-and 'not_hdr' otherwise.
-
-Some template fields such as 'folder_template' are "path-like" in that they
-join  multiple elements into a single path-like string.  For example, if photo
-is in  album Album1 in folder Folder1, '{folder_album}` results in
-'Folder1/Album1'.  This is so these template fields may be used as paths in
--directory.  If you intend to use such a field as a string, e.g. in the
-filename, you may specify  a different path separator using the form:
-'{TEMPLATE_FIELD(PATH_SEP)}'.  For example, using the example above,
-'{folder_album(-)}' would result in  'Folder1-Album1' and '{folder_album()}'
-would result in  'Folder1Album1'.
-
-Some templates may resolve to more than one value.  For example, a photo can
-have  multiple keywords so '{keyword}' can result in multiple values.  If used
-in a filename  or directory, these templates may result in more than one copy
-of the photo being exported.  For example, if photo has keywords "foo" and
-"bar", --directory '{keyword}' will result in  copies of the photo being
-exported to 'foo/image_name.jpeg' and 'bar/image_name.jpeg'.
-
-Multi-value template fields such as '{keyword}' may be expanded 'in place'
-with an optional delimiter using the template form '{DELIM+TEMPLATE_FIELD}'.
-For example, a photo with  keywords 'foo' and 'bar':
+- 'DELIM+' Multi-value template fields such as '{keyword}' may be expanded 'in
+place' with an optional delimiter using the template form
+'{DELIM+TEMPLATE_FIELD}'. For example, a photo with  keywords 'foo' and 'bar':

 '{keyword}' renders to 'foo' and 'bar'

@@ -568,6 +664,62 @@ For example, a photo with  keywords 'foo' and 'bar':

 '{+keyword}' renders to 'foobar'

+- 'TEMPLATE_FIELD' The name of the template field, for example 'keyword'
+
+- '(PATH_SEP)' Some template fields such as '{folder_album}' are "path-like"
+in  that they join multiple elements into a single path-like string. For
+example,  if photo is in album Album1 in folder Folder1, '{folder_album}'
+results in 'Folder1/Album1'. This is so these template fields may be used as
+paths in --directory. If you intend to use such a field as a string, e.g. in
+the filename, you may specify a different path separator using the form:
+'{TEMPLATE_FIELD(PATH_SEP)}'. For example, using the example above,
+'{folder_album(-)}' would result in 'Folder1-Album1' and '{folder_album()}'
+would result in  'Folder1Album1'.
+
+- '[OLD,NEW]' Use the [OLD,NEW] option to replace text "OLD" in the template
+value with text "NEW". For example, if you have album names with '/' in the
+album name you could replace '/' with "-" using the template '{album[/,-]}'.
+This would replace any occurence of "/" in the album name with "-"; album
+"Vacation/2019" would thus become "Vacation-2019".  You may specify more than
+one pair of OLD,NEW values by listing them delimited by '|'. For example:
+'{album[/,-|:,-]}' to replace both '/' and ':' by '-'. You can also use the
+[OLD,NEW] syntax to delete a character by omitting the NEW value as in
+'{album[/,]}'.
+
+- '?' Some template fields such as 'hdr' are boolean and resolve to True or
+False. These take the form: '{TEMPLATE_FIELD?VALUE_IF_TRUE,VALUE_IF_FALSE}',
+e.g. {hdr?is_hdr,not_hdr} which would result in 'is_hdr' if photo is an HDR
+image and 'not_hdr' otherwise.
+
+- ',DEFAULT' The ',' and DEFAULT value are optional.  If TEMPLATE_FIELD
+results in a null (empty) value, the template will result in default value of
+'_'. You may specify an alternate default value by appending ',DEFAULT' after
+template_field. Example: '{title,no_title}' would result in 'no_title' if the
+photo had no title. Example: '{created.year}/{place.address,NO_ADDRESS}' but
+there was  no address associated with the photo, the resulting output would
+be: '2020/NO_ADDRESS/photoname.jpg'. If specified, the default value may not
+contain a brace symbol ('{' or '}').
+
+Again, if you do not specify a default value and the template substitution has
+no value, '_' (underscore) will be used as the default value. For example, in
+the above example, this would result in '2020/_/photoname.jpg' if address was
+null.
+
+You may specify a null default (e.g. "" or empty string) by omitting the value
+after the comma, e.g. {title,} which would render to "" if title had no value
+thus effectively deleting the template from the resulting string.
+
+You may include other text in the template string outside the {} and use more
+than one template field in a single string,  e.g. '{created.year} -
+{created.month}' (e.g. '2020 - November').
+
+Some templates may resolve to more than one value.  For example, a photo can
+have multiple keywords so '{keyword}' can result in multiple values.  If used
+in a filename  or directory, these templates may result in more than one copy
+of the photo being exported.  For example, if photo has keywords "foo" and
+"bar", --directory '{keyword}' will result in  copies of the photo being
+exported to 'foo/image_name.jpeg' and 'bar/image_name.jpeg'.
+
 Some template fields such as '{media_type}' use the 'DEFAULT' value to allow
 customization  of the output. For example, '{media_type}' resolves to the
 special media type of the  photo such as 'panorama' or 'selfie'.  You may use
@@ -577,6 +729,28 @@ photo is a time_lapse photo, 'media_type' would resolve to  'vidéo_accélérée
 instead of 'time_lapse' and video would resolve to 'vidéo' if photo is an
 ordinary video.

+With the --directory and --filename options you may specify a template for the
+export directory or filename, respectively. The directory will be appended to
+the export path specified in the export DEST argument to export. For example,
+if template is '{created.year}/{created.month}', and export destination DEST
+is '/Users/maria/Pictures/export', the actual export directory for a photo
+would be '/Users/maria/Pictures/export/2020/March' if the photo was created in
+March 2020.
+
+The templating system may also be used with the --keyword-template option to
+set keywords on export (with --exiftool or --sidecar), for example, to set a
+new keyword in format 'folder/subfolder/album' to preserve the folder/album
+structure, you can use --keyword-template "{folder_album}"
+
+In the template, valid template substitutions will be replaced by the
+corresponding value from the table below.  Invalid substitutions will result
+in an error.
+
+If you want the actual text of the template substition to appear in the
+rendered name, use double braces, e.g. '{{' or '}}', thus using
+'{created.year}/{{name}}' for --directory would result in output of
+2020/{name}/photoname.jpg
+
 With the --directory and --filename options you may specify a template for the
 export directory or filename, respectively. The directory will be appended to
 the export path specified in the export DEST argument to export.  For example,
@@ -667,27 +841,39 @@ Substitution                    Description
                                https://strftime.org/ for help on strftime
                                templates.
 {modified.date}                 Photo's modification date in ISO format,
-                                e.g. '2020-03-22'
-{modified.year}                 4-digit year of photo modification time
-{modified.yy}                   2-digit year of photo modification time
+                                e.g. '2020-03-22'; uses creation date if
+                                photo is not modified
+{modified.year}                 4-digit year of photo modification time;
+                                uses creation date if photo is not modified
+{modified.yy}                   2-digit year of photo modification time;
+                                uses creation date if photo is not modified
 {modified.mm}                   2-digit month of the photo modification time
-                                (zero padded)
+                                (zero padded); uses creation date if photo
+                                is not modified
 {modified.month}                Month name in user's locale of the photo
-                                modification time
+                                modification time; uses creation date if
+                                photo is not modified
 {modified.mon}                  Month abbreviation in the user's locale of
-                                the photo modification time
+                                the photo modification time; uses creation
+                                date if photo is not modified
 {modified.dd}                   2-digit day of the month (zero padded) of
-                                the photo modification time
+                                the photo modification time; uses creation
+                                date if photo is not modified
 {modified.dow}                  Day of week in user's locale of the photo
-                                modification time
+                                modification time; uses creation date if
+                                photo is not modified
 {modified.doy}                  3-digit day of year (e.g Julian day) of
                                photo modification time, starting from 1
-                                (zero padded)
-{modified.hour}                 2-digit hour of the photo modification time
+                                (zero padded); uses creation date if photo
+                                is not modified
+{modified.hour}                 2-digit hour of the photo modification time;
+                                uses creation date if photo is not modified
 {modified.min}                  2-digit minute of the photo modification
-                                time
+                                time; uses creation date if photo is not
+                                modified
 {modified.sec}                  2-digit second of the photo modification
-                                time
+                                time; uses creation date if photo is not
+                                modified
 {today.date}                    Current date in iso format, e.g.
                                '2020-03-22'
 {today.year}                    4-digit year of current date
@@ -748,6 +934,19 @@ Substitution                    Description
                                e.g. 'Summer'; (Photos 5+ only, applied
                                automatically by Photos' image
                                categorization algorithms).
+{exif.camera_make}              Camera make from original photo's EXIF
+                                inormation as imported by Photos, e.g.
+                                'Apple'
+{exif.camera_model}             Camera model from original photo's EXIF
+                                inormation as imported by Photos, e.g.
+                                'iPhone 6s'
+{exif.lens_model}               Lens model from original photo's EXIF
+                                inormation as imported by Photos, e.g.
+                                'iPhone 6s back camera 4.15mm f/2.2'
+{uuid}                          Photo's internal universally unique
+                                identifier (UUID) for the photo, a
+                                36-character string unique to the photo,
+                                e.g. '128FB4C6-0B16-4E7D-9108-FB2E90DA1546'

 The following substitutions may result in multiple values. Thus if specified
 for --directory these could result in multiple copies of a photo being being
@@ -792,29 +991,7 @@ Substitution              Description
                          algorithms).
 ```

-Example: export all photos to ~/Desktop/export group in folders by date created

-`osxphotos export --export-by-date ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export`
-
-**Note**: Photos library/database path can also be specified using --db option:
-
-`osxphotos export --export-by-date --db ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export`
-
-Example: find all photos with keyword "Kids" and output results to json file named results.json:
-
-`osxphotos query --keyword Kids --json ~/Pictures/Photos\ Library.photoslibrary >results.json`
-
-Example: export photos to file structure based on 4-digit year and full name of month of photo's creation date:
-
-`osxphotos export ~/Desktop/export --directory "{created.year}/{created.month}"`
-
-Example: 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):
-
-`osxphotos export ~/Desktop/export --directory "{created.year}" --keyword-template "{label}" --keyword-template "{media_type}"` 
-
-Example: 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
-
-`osxphotos export ~/Desktop/export --directory "{place.name.country,NoCountry}/{created.year}"  --person-keyword --album-keyword --keyword-template "{created.year}" --exiftool --update --verbose`


 ## Example uses of the package 
@@ -1561,7 +1738,7 @@ exiftool must be installed in the path for this to work.  If exiftool cannot be

 `ExifTool` provides the following methods:

- `asdict()`: returns all EXIF metadata found in the file as a dictionary in following form (Note: this shows just a subset of available metadata).  See [exiftool](https://exiftool.org/) documentation to understand which metadata keys are available.
+- `asdict(tag_groups=True)`: returns all EXIF metadata found in the file as a dictionary in following form (Note: this shows just a subset of available metadata).  See [exiftool](https://exiftool.org/) documentation to understand which metadata keys are available. If `tag_groups` is True (default) dict keys are in form "GROUP:TAG", e.g. "IPTC:Keywords". If `tag_groups` is False, dict keys do not have group names, e.g. "Keywords".

 ```python
 {'Composite:Aperture': 2.2,
@@ -1641,7 +1818,7 @@ If overwrite=False and increment=False, export will fail if destination file alr

 #### <a name="rendertemplate">`render_template()`</a>

-`render_template(template_str, none_str = "_", path_sep = None, expand_inplace = False, inplace_sep = None, filename=False, dirname=False, replacement=":",)`
+`render_template(template_str, none_str = "_", path_sep = None, expand_inplace = False, inplace_sep = None, filename=False, dirname=False, strip=False)`

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

@@ -1652,7 +1829,7 @@ Render template string for photo.  none_str is used if template substitution res
 - `inplace_sep`: optional string to use as separator between multi-valued keywords with expand_inplace; default is ','
 - `filename`: if True, template output will be sanitized to produce valid file name
 - `dirname`: if True, template output will be sanitized to produce valid directory name
- `replacement`: str, value to replace any illegal file path characters with; default = ":"
+- `strip`: if True, leading/trailign whitespace will be stripped from rendered template strings

 Returns a tuple of (rendered, unmatched) where rendered is a list of rendered strings with all substitutions made and unmatched is a list of any strings that resembled a template substitution but did not match a known substitution. E.g. if template contained "{foo}", unmatched would be ["foo"].

@@ -1666,7 +1843,7 @@ Some substitutions, notably `album`, `keyword`, and `person` could return multip

 The template field format contains optional modifiers:

-`"{[[DELIM]+]name[(PATH_SEP)][?TRUE_VALUE][,[DEFAULT]]}"`
+`"{DELIM+name(PATH_SEP)[OLD,NEW]?TRUE_VALUE,DEFAULT}"`

 `DELIM`: optional delimiter string to use when expanding multi-valued template values in-place

@@ -1687,6 +1864,8 @@ e.g. If Photo is in `Album1` in `Folder1`:
 - `"{folder_album(:)}"` renders to `["Folder1:Album1"]`
 - `"{folder_album()}"` renders to `["Folder1Album1"]`

+`[OLD,NEW]`: optional text replacement to perform on rendered template value.  For example, to replace "/" in an album name, you could use the template `"{album[/,-]}"`.
+
 `?TRUE_VALUE`: optional value to use if name is boolean-type field which evaluates to true.  For example `"{hdr}"` evaluates to True if photo is an high dynamic range (HDR) image and False otherwise. In these types of fields, use `?TRUE_VALUE` to provide the value if True and `,DEFAULT` to provide the value of False.  

 e.g. if photo is an HDR image,
@@ -2224,18 +2403,18 @@ The following template field substitutions are availabe for use with `PhotoInfo.
 |{created.min}|2-digit minute of the photo creation time|
 |{created.sec}|2-digit second of the photo creation time|
 |{created.strftime}|Apply strftime template to file creation date/time. Should be used in form {created.strftime,TEMPLATE} where TEMPLATE is a valid strftime template, e.g. {created.strftime,%Y-%U} would result in year-week number of year: '2020-23'. If used with no template will return null value. See https://strftime.org/ for help on strftime templates.|
-|{modified.date}|Photo's modification date in ISO format, e.g. '2020-03-22'|
-|{modified.year}|4-digit year of photo modification time|
-|{modified.yy}|2-digit year of photo modification time|
-|{modified.mm}|2-digit month of the photo modification time (zero padded)|
-|{modified.month}|Month name in user's locale of the photo modification time|
-|{modified.mon}|Month abbreviation in the user's locale of the photo modification time|
-|{modified.dd}|2-digit day of the month (zero padded) of the photo modification time|
-|{modified.dow}|Day of week in user's locale of the photo modification time|
-|{modified.doy}|3-digit day of year (e.g Julian day) of photo modification time, starting from 1 (zero padded)|
-|{modified.hour}|2-digit hour of the photo modification time|
-|{modified.min}|2-digit minute of the photo modification time|
-|{modified.sec}|2-digit second of the photo modification time|
+|{modified.date}|Photo's modification date in ISO format, e.g. '2020-03-22'; uses creation date if photo is not modified|
+|{modified.year}|4-digit year of photo modification time; uses creation date if photo is not modified|
+|{modified.yy}|2-digit year of photo modification time; uses creation date if photo is not modified|
+|{modified.mm}|2-digit month of the photo modification time (zero padded); uses creation date if photo is not modified|
+|{modified.month}|Month name in user's locale of the photo modification time; uses creation date if photo is not modified|
+|{modified.mon}|Month abbreviation in the user's locale of the photo modification time; uses creation date if photo is not modified|
+|{modified.dd}|2-digit day of the month (zero padded) of the photo modification time; uses creation date if photo is not modified|
+|{modified.dow}|Day of week in user's locale of the photo modification time; uses creation date if photo is not modified|
+|{modified.doy}|3-digit day of year (e.g Julian day) of photo modification time, starting from 1 (zero padded); uses creation date if photo is not modified|
+|{modified.hour}|2-digit hour of the photo modification time; uses creation date if photo is not modified|
+|{modified.min}|2-digit minute of the photo modification time; uses creation date if photo is not modified|
+|{modified.sec}|2-digit second of the photo modification time; uses creation date if photo is not modified|
 |{today.date}|Current date in iso format, e.g. '2020-03-22'|
 |{today.year}|4-digit year of current date|
 |{today.yy}|2-digit year of current date|
@@ -2263,6 +2442,10 @@ The following template field substitutions are availabe for use with `PhotoInfo.
 |{place.address.country}|Country name of the postal address, e.g. 'United States'|
 |{place.address.country_code}|ISO country code of the postal address, e.g. 'US'|
 |{searchinfo.season}|Season of the year associated with a photo, e.g. 'Summer'; (Photos 5+ only, applied automatically by Photos' image categorization algorithms).|
+|{exif.camera_make}|Camera make from original photo's EXIF inormation as imported by Photos, e.g. 'Apple'|
+|{exif.camera_model}|Camera model from original photo's EXIF inormation as imported by Photos, e.g. 'iPhone 6s'|
+|{exif.lens_model}|Lens model from original photo's EXIF inormation as imported by Photos, e.g. 'iPhone 6s back camera 4.15mm f/2.2'|
+|{uuid}|Photo's internal universally unique identifier (UUID) for the photo, a 36-character string unique to the photo, e.g. '128FB4C6-0B16-4E7D-9108-FB2E90DA1546'|
 |{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|
 |{keyword}|Keyword(s) assigned to photo|
@@ -2384,20 +2567,22 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
 <!-- markdownlint-disable -->
 <table>
  <tr>
-    <td align="center"><a href="https://github.com/britiscurious"><img src="https://avatars1.githubusercontent.com/u/25646439?v=4?s=100" width="100px;" alt=""/><br /><sub><b>britiscurious</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=britiscurious" title="Documentation">📖</a> <a href="https://github.com/RhetTbull/osxphotos/commits?author=britiscurious" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/mwort"><img src="https://avatars3.githubusercontent.com/u/8170417?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Michel Wortmann</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=mwort" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/PabloKohan"><img src="https://avatars3.githubusercontent.com/u/8790976?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Pablo 'merKur' Kohan</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=PabloKohan" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/hshore29"><img src="https://avatars2.githubusercontent.com/u/7023497?v=4?s=100" width="100px;" alt=""/><br /><sub><b>hshore29</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=hshore29" title="Code">💻</a></td>
-    <td align="center"><a href="http://3e.org/"><img src="https://avatars0.githubusercontent.com/u/41439?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Daniel M. Drucker</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=dmd" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/jystervinou"><img src="https://avatars3.githubusercontent.com/u/132356?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jean-Yves Stervinou</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=jystervinou" title="Code">💻</a></td>
-    <td align="center"><a href="https://dethi.me/"><img src="https://avatars2.githubusercontent.com/u/1011520?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Thibault Deutsch</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=dethi" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/britiscurious"><img src="https://avatars1.githubusercontent.com/u/25646439?v=4?s=75" width="75px;" alt=""/><br /><sub><b>britiscurious</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=britiscurious" title="Documentation">📖</a> <a href="https://github.com/RhetTbull/osxphotos/commits?author=britiscurious" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/mwort"><img src="https://avatars3.githubusercontent.com/u/8170417?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Michel Wortmann</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=mwort" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/PabloKohan"><img src="https://avatars3.githubusercontent.com/u/8790976?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Pablo 'merKur' Kohan</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=PabloKohan" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/hshore29"><img src="https://avatars2.githubusercontent.com/u/7023497?v=4?s=75" width="75px;" alt=""/><br /><sub><b>hshore29</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=hshore29" title="Code">💻</a></td>
+    <td align="center"><a href="http://3e.org/"><img src="https://avatars0.githubusercontent.com/u/41439?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Daniel M. Drucker</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=dmd" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jystervinou"><img src="https://avatars3.githubusercontent.com/u/132356?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Jean-Yves Stervinou</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=jystervinou" title="Code">💻</a></td>
+    <td align="center"><a href="https://dethi.me/"><img src="https://avatars2.githubusercontent.com/u/1011520?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Thibault Deutsch</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=dethi" title="Code">💻</a></td>
  </tr>
  <tr>
-    <td align="center"><a href="https://github.com/grundsch"><img src="https://avatars0.githubusercontent.com/u/3874928?v=4?s=100" width="100px;" alt=""/><br /><sub><b>grundsch</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=grundsch" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/agprimatic"><img src="https://avatars1.githubusercontent.com/u/4685054?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Ag Primatic</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=agprimatic" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/hhoeck"><img src="https://avatars1.githubusercontent.com/u/6313998?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Horst Höck</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=hhoeck" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/jstrine"><img src="https://avatars1.githubusercontent.com/u/33943447?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Jonathan Strine</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=jstrine" title="Code">💻</a></td>
-    <td align="center"><a href="https://github.com/finestream"><img src="https://avatars1.githubusercontent.com/u/16638513?v=4?s=100" width="100px;" alt=""/><br /><sub><b>finestream</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=finestream" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/grundsch"><img src="https://avatars0.githubusercontent.com/u/3874928?v=4?s=75" width="75px;" alt=""/><br /><sub><b>grundsch</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=grundsch" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/agprimatic"><img src="https://avatars1.githubusercontent.com/u/4685054?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Ag Primatic</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=agprimatic" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/hhoeck"><img src="https://avatars1.githubusercontent.com/u/6313998?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Horst Höck</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=hhoeck" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/jstrine"><img src="https://avatars1.githubusercontent.com/u/33943447?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Jonathan Strine</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=jstrine" title="Code">💻</a></td>
+    <td align="center"><a href="https://github.com/finestream"><img src="https://avatars1.githubusercontent.com/u/16638513?v=4?s=75" width="75px;" alt=""/><br /><sub><b>finestream</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=finestream" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://github.com/synox"><img src="https://avatars2.githubusercontent.com/u/2250964?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Aravindo Wingeier</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=synox" title="Documentation">📖</a></td>
+    <td align="center"><a href="https://kradalby.no"><img src="https://avatars1.githubusercontent.com/u/98431?v=4?s=75" width="75px;" alt=""/><br /><sub><b>Kristoffer Dalby</b></sub></a><br /><a href="https://github.com/RhetTbull/osxphotos/commits?author=kradalby" title="Code">💻</a></td>
  </tr>
 </table>

@@ -2433,6 +2618,7 @@ For additional details about how osxphotos is implemented or if you would like t
 - [pathvalidate](https://pypi.org/project/pathvalidate/)
 - [wurlitzer](https://pypi.org/project/wurlitzer/)
 - [toml](https://github.com/uiri/toml)
+- [PhotoScript](https://github.com/RhetTbull/PhotoScript)


 ## Acknowledgements
--- a/README.rst
+++ b/README.rst
@@ -0,0 +1,270 @@
+.. role:: raw-html-m2r(raw)
+   :format: html
+
+
+OSXPhotos
+=========
+
+What is osxphotos?
+------------------
+
+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. 
+
+Supported operating systems
+---------------------------
+
+Only works on macOS (aka Mac OS X). Tested on macOS Sierra (10.12.6) until macOS Catalina (10.15.7). 
+Beta support for macOS Big Sur (10.16.01/11.01).
+
+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.
+
+Requires python >= ``3.7``. 
+
+Installation
+------------
+
+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. 
+
+Installation using pipx
+^^^^^^^^^^^^^^^^^^^^^^^
+
+If you aren't familiar with installing python applications, I recommend you install ``osxphotos`` with `pipx <https://github.com/pipxproject/pipx>`_. If you use ``pipx``\ , you will not need to create a virtual environment as ``pipx`` takes care of this. The easiest way to do this on a Mac is to use `homebrew <https://brew.sh/>`_\ :
+
+
+* Open ``Terminal`` (search for ``Terminal`` in Spotlight or look in ``Applications/Utilities``\ )
+* Install ``homebrew`` according to instructions at `https://brew.sh/ <https://brew.sh/>`_
+* Type the following into Terminal: ``brew install pipx``
+* Then type this: ``pipx install osxphotos``
+* Now you should be able to run ``osxphotos`` by typing: ``osxphotos``
+
+Installation using pip
+^^^^^^^^^^^^^^^^^^^^^^
+
+You can also install directly from `pypi <https://pypi.org/project/osxphotos/>`_\ :
+
+.. code-block::
+
+   pip install osxphotos
+
+
+Installation from git repository
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+OSXPhotos uses setuptools, thus simply run:
+
+.. code-block::
+
+   git clone https://github.com/RhetTbull/osxphotos.git
+   cd osxphotos
+   python3 setup.py install
+
+
+I recommend you create a `virtual environment <https://docs.python.org/3/tutorial/venv.html>`_ before installing osxphotos.
+
+**WARNING** The git repo for this project is very large (> 1GB) because it contains multiple Photos libraries used for testing 
+on different versions of macOS.  If you just want to use the osxphotos package in your own code, 
+I recommend you install the latest version from `PyPI <https://pypi.org/project/osxphotos/>`_ which does not include all the test 
+libraries. If you just want to use the command line utility, you can download a pre-built executable of the latest 
+`release <https://github.com/RhetTbull/osxphotos/releases>`_ or you can install via ``pip`` 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 ``pipx`` as described above.
+
+Command Line Usage
+------------------
+
+This package will install a command line utility called ``osxphotos`` that allows you to query the Photos database and export photos.  
+Alternatively, you can also run the command line utility like this: ``python3 -m osxphotos``
+
+.. code-block::
+
+   > osxphotos
+   Usage: osxphotos [OPTIONS] COMMAND [ARGS]...
+
+   Options:
+     --db <Photos database path>  Specify Photos database path. Path to Photos
+                                  library/database can be specified using either
+                                  --db or directly as PHOTOS_LIBRARY positional
+                                  argument. If neither --db or PHOTOS_LIBRARY
+                                  provided, will attempt to find the library to
+                                  use in the following order: 1. last opened
+                                  library, 2. system library, 3.
+                                  ~/Pictures/Photos Library.photoslibrary
+     --json                       Print output in JSON format.
+     -v, --version                Show the version and exit.
+     -h, --help                   Show this message and exit.
+
+   Commands:
+     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...
+
+To get help on a specific command, use ``osxphotos help <command_name>``
+
+Command line examples
+^^^^^^^^^^^^^^^^^^^^^
+
+export all photos to ~/Desktop/export group in folders by date created
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``osxphotos export --export-by-date ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export``
+
+**Note**\ : Photos library/database path can also be specified using ``--db`` option:
+
+``osxphotos export --export-by-date --db ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export``
+
+find all photos with keyword "Kids" and output results to json file named results.json:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``osxphotos query --keyword Kids --json ~/Pictures/Photos\ Library.photoslibrary >results.json``
+
+export photos to file structure based on 4-digit year and full name of month of photo's creation date:
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``osxphotos export ~/Desktop/export --directory "{created.year}/{created.month}"``
+
+(by default, it will attempt to use the system library)
+
+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):
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``osxphotos export ~/Desktop/export --directory "{created.year}" --keyword-template "{label}" --keyword-template "{media_type}"`` 
+
+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
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+``osxphotos export ~/Desktop/export --directory "{place.name.country,NoCountry}/{created.year}"  --person-keyword --album-keyword --keyword-template "{created.year}" --exiftool --update --verbose``
+
+Example uses of the package
+---------------------------
+
+.. code-block:: python
+
+   """ Simple usage of the package """
+   import osxphotos
+
+   def main():
+       photosdb = osxphotos.PhotosDB()
+       print(photosdb.keywords)
+       print(photosdb.persons)
+       print(photosdb.album_names)
+
+       print(photosdb.keywords_as_dict)
+       print(photosdb.persons_as_dict)
+       print(photosdb.albums_as_dict)
+
+       # find all photos with Keyword = Foo and containing John Smith
+       photos = photosdb.photos(keywords=["Foo"],persons=["John Smith"])
+
+       # find all photos that include Alice Smith but do not contain the keyword Bar
+       photos = [p for p in photosdb.photos(persons=["Alice Smith"]) 
+                   if p not in photosdb.photos(keywords=["Bar"]) ]
+       for p in photos:
+           print(
+               p.uuid,
+               p.filename,
+               p.original_filename,
+               p.date,
+               p.description,
+               p.title,
+               p.keywords,
+               p.albums,
+               p.persons,
+               p.path,
+           )
+
+   if __name__ == "__main__":
+       main()
+
+.. code-block:: python
+
+   """ Export all photos to specified directory using album names as folders
+       If file has been edited, also export the edited version, 
+       otherwise, export the original version 
+       This will result in duplicate photos if photo is in more than album """
+
+   import os.path
+   import pathlib
+   import sys
+
+   import click
+   from pathvalidate import is_valid_filepath, sanitize_filepath
+
+   import osxphotos
+
+
+   @click.command()
+   @click.argument("export_path", type=click.Path(exists=True))
+   @click.option(
+       "--default-album",
+       help="Default folder for photos with no album. Defaults to 'unfiled'",
+       default="unfiled",
+   )
+   @click.option(
+       "--library-path",
+       help="Path to Photos library, default to last used library",
+       default=None,
+   )
+   def export(export_path, default_album, library_path):
+       export_path = os.path.expanduser(export_path)
+       library_path = os.path.expanduser(library_path) if library_path else None
+
+       if library_path is not None:
+           photosdb = osxphotos.PhotosDB(library_path)
+       else:
+           photosdb = osxphotos.PhotosDB()
+
+       photos = photosdb.photos()
+
+       for p in photos:
+           if not p.ismissing:
+               albums = p.albums
+               if not albums:
+                   albums = [default_album]
+               for album in albums:
+                   click.echo(f"exporting {p.filename} in album {album}")
+
+                   # make sure no invalid characters in destination path (could be in album name)
+                   album_name = sanitize_filepath(album, platform="auto")
+
+                   # create destination folder, if necessary, based on album name
+                   dest_dir = os.path.join(export_path, album_name)
+
+                   # verify path is a valid path
+                   if not is_valid_filepath(dest_dir, platform="auto"):
+                       sys.exit(f"Invalid filepath {dest_dir}")
+
+                   # create destination dir if needed
+                   if not os.path.isdir(dest_dir):
+                       os.makedirs(dest_dir)
+
+                   # export the photo
+                   if p.hasadjustments:
+                       # export edited version
+                       exported = p.export(dest_dir, edited=True)
+                       edited_name = pathlib.Path(p.path_edited).name
+                       click.echo(f"Exported {edited_name} to {exported}")
+                   # export unedited version
+                   exported = p.export(dest_dir)
+                   click.echo(f"Exported {p.filename} to {exported}")
+           else:
+               click.echo(f"Skipping missing photo: {p.filename}")
+
+
+   if __name__ == "__main__":
+       export()  # pylint: disable=no-value-for-parameter
+
+Package Interface
+-----------------
+
+Reference full documentation on `GitHub <https://github.com/RhetTbull/osxphotos/blob/master/README.md>`_
--- a/osxphotos/main.py
+++ b/osxphotos/main.py
@@ -11,12 +11,14 @@ import time
 import unicodedata

 import click
+import osxmetadata
 import yaml

 import osxphotos

 from ._constants import (
    _EXIF_TOOL_URL,
+    _OSXPHOTOS_NONE_SENTINEL,
    _PHOTOS_4_VERSION,
    _UNKNOWN_PLACE,
    CLI_COLOR_ERROR,
@@ -24,6 +26,8 @@ from ._constants import (
    DEFAULT_EDITED_SUFFIX,
    DEFAULT_JPEG_QUALITY,
    DEFAULT_ORIGINAL_SUFFIX,
+    EXTENDED_ATTRIBUTE_NAMES,
+    EXTENDED_ATTRIBUTE_NAMES_QUOTED,
    SIDECAR_EXIFTOOL,
    SIDECAR_JSON,
    SIDECAR_XMP,
@@ -179,72 +183,157 @@ class ExportCommand(click.Command):
            + "You can always run export without the --update option to re-export the entire library thus "
            + f"rebuilding the '{OSXPHOTOS_EXPORT_DB}' database."
        )
+        formatter.write("\n\n")
+        formatter.write_text("** Extended Attributes **")
+        formatter.write("\n")
+        formatter.write_text(
+            """
+Some options (currently '--finder-tag-template', '--finder-tag-keywords', '-xattr-template') write
+additional metadata to extended attributes in the file. These options will only work
+if the destination filesystem supports extended attributes (most do).
+For example, --finder-tag-keyword writes all keywords (including any specified by '--keyword-template'
+or other options) to Finder tags that are searchable in Spotlight using the syntax: 'tag:tagname'.
+For example, if you have images with keyword "Travel" then using '--finder-tag-keywords' you could quickly
+find those images in the Finder by typing 'tag:Travel' in the Spotlight search bar.
+Finder tags are written to the 'com.apple.metadata:_kMDItemUserTags' extended attribute.
+Unlike EXIF metadata, extended attributes do not modify the actual file. Most cloud storage services
+do not synch extended attributes. Dropbox does sync them and any changes to a file's extended attributes
+will cause Dropbox to re-sync the files.

+The following attributes may be used with '--xattr-template':
+
+            """
+        )
+        formatter.write_dl(
+            [
+                (
+                    attr,
+                    f"{osxmetadata.ATTRIBUTES[attr].help} ({osxmetadata.ATTRIBUTES[attr].constant})",
+                )
+                for attr in EXTENDED_ATTRIBUTE_NAMES
+            ]
+        )
+        formatter.write("\n")
+        formatter.write_text(
+            "For additional information on extended attributes see: https://developer.apple.com/documentation/coreservices/file_metadata/mditem/common_metadata_attribute_keys"
+        )
        formatter.write("\n\n")
        formatter.write_text("** Templating System **")
        formatter.write("\n")
        formatter.write_text(
            """
-Several options, such as --directory, allow you to specify a template 
-which will be rendered to substitute template fields with values from the photo. 
-For example, '{created.month}' would be replaced with the month name of the photo creation date. 
-e.g. 'November'. 
-\n
-Some options supporting templates may be repeated e.g., --keyword-template '{label}' 
--keyword-template '{media_type}' to add both labels and media types to the 
-keywords.
-\n
-The general format for a template is '{TEMPLATE_FIELD[,[DEFAULT]]}'. 
-Some templates have optional modifiers in form 
-'{[[DELIM]+]TEMPLATE_FIELD[(PATH_SEP)][?VALUE_IF_TRUE][,[DEFAULT]]}'
-\n
-The ',' and DEFAULT value are optional. 
-If TEMPLATE_FIELD results in a null (empty) value, the default is '_'.  
-You may specify an alternate default value by appending ',DEFAULT' after template_field. 
-e.g. '{title,no_title}' would result in 'no_title' if the photo had no title. 
-You may include other text in the template string outside the {} and use more than 
-one template field, e.g. '{created.year} - {created.month}' (e.g. '2020 - November'). 
-\n
-Some template fields such as 'hdr' are boolean and resolve to True or False. 
-These take the form: '{TEMPLATE_FIELD?VALUE_IF_TRUE,VALUE_IF_FALSE}', e.g. 
-{hdr?is_hdr,not_hdr} which would result in 'is_hdr' if photo is an HDR 
-image and 'not_hdr' otherwise.
-\n
-Some template fields such as 'folder_template' are "path-like" in that they join 
-multiple elements into a single path-like string.  For example, if photo is in 
-album Album1 in folder Folder1, '{folder_album}` results in 'Folder1/Album1'. 
-This is so these template fields may be used as paths in --directory. 
-If you intend to use such a field as a string, e.g. in the filename, you may specify 
-a different path separator using the form: '{TEMPLATE_FIELD(PATH_SEP)}'. 
-For example, using the example above, '{folder_album(-)}' would result in 
-'Folder1-Album1' and '{folder_album()}' would result in 
-'Folder1Album1'.
-\n
-Some templates may resolve to more than one value.  For example, a photo can have 
-multiple keywords so '{keyword}' can result in multiple values.  If used in a filename 
-or directory, these templates may result in more than one copy of the photo being exported. 
-For example, if photo has keywords "foo" and "bar", --directory '{keyword}' will result in 
-copies of the photo being exported to 'foo/image_name.jpeg' and 'bar/image_name.jpeg'.  
-\n
-Multi-value template fields such as '{keyword}' may be expanded 'in place' with an optional
-delimiter using the template form '{DELIM+TEMPLATE_FIELD}'.  For example, a photo with 
-keywords 'foo' and 'bar':
-\n
+Several options, such as --directory, allow you to specify a template  which
+will be rendered to substitute template fields with values from the photo.
+For example, '{created.month}' would be replaced with the month name of the
+photo creation date.  e.g. 'November'.
+
+Some options supporting templates may be repeated e.g., --keyword-template
+'{label}'  --keyword-template '{media_type}' to add both labels and media
+types to the  keywords.
+
+The general format for a template is '{TEMPLATE_FIELD,DEFAULT}'. The full template format is: 
+'{DELIM+TEMPLATE_FIELD(PATH_SEP)[OLD,NEW]?VALUE_IF_TRUE,DEFAULT}'
+
+With a few exceptions (like '{created.strftime}') everything but the TEMPLATE_FIELD
+is optional.
+
+- 'DELIM+' Multi-value template fields such as '{keyword}' may be expanded 'in place'
+with an optional delimiter using the template form '{DELIM+TEMPLATE_FIELD}'.
+For example, a photo with  keywords 'foo' and 'bar':
+
 '{keyword}' renders to 'foo' and 'bar'
-\n
+
 '{,+keyword}' renders to: 'foo,bar'
-\n
+
 '{; +keyword}' renders to: 'foo; bar'
-\n
+
 '{+keyword}' renders to 'foobar'
-\n
-Some template fields such as '{media_type}' use the 'DEFAULT' value to allow customization 
-of the output. For example, '{media_type}' resolves to the special media type of the 
-photo such as 'panorama' or 'selfie'.  You may use the 'DEFAULT' value to override 
-these in form: '{media_type,video=vidéo;time_lapse=vidéo_accélérée}'. 
-In this example, if photo is a time_lapse photo, 'media_type' would resolve to 
-'vidéo_accélérée' instead of 'time_lapse' and video would resolve to 'vidéo' if photo
-is an ordinary video. 
+
+- 'TEMPLATE_FIELD' The name of the template field, for example 'keyword'
+
+- '(PATH_SEP)' Some template fields such as '{folder_album}' are "path-like" in 
+that they join multiple elements into a single path-like string. For example, 
+if photo is in album Album1 in folder Folder1, '{folder_album}' results in
+'Folder1/Album1'. This is so these template fields may be used as paths in
+--directory. If you intend to use such a field as a string, e.g. in the
+filename, you may specify a different path separator using the form:
+'{TEMPLATE_FIELD(PATH_SEP)}'. For example, using the example above,
+'{folder_album(-)}' would result in 'Folder1-Album1' and '{folder_album()}'
+would result in  'Folder1Album1'.
+
+- '[OLD,NEW]' Use the [OLD,NEW] option to replace text "OLD" in the template value
+with text "NEW". For example, if you have album names with '/' in the album name you
+could replace '/' with "-" using the template '{album[/,-]}'. This would replace
+any occurence of "/" in the album name with "-"; album "Vacation/2019" would thus
+become "Vacation-2019".  You may specify more than one pair of OLD,NEW values by
+listing them delimited by '|'. For example: '{album[/,-|:,-]}' to replace both
+'/' and ':' by '-'. You can also use the [OLD,NEW] syntax to delete a character by
+omitting the NEW value as in '{album[/,]}'.
+
+- '?' Some template fields such as 'hdr' are boolean and resolve to True or False.
+These take the form: '{TEMPLATE_FIELD?VALUE_IF_TRUE,VALUE_IF_FALSE}', e.g.
+{hdr?is_hdr,not_hdr} which would result in 'is_hdr' if photo is an HDR  image
+and 'not_hdr' otherwise.
+
+- ',DEFAULT' The ',' and DEFAULT value are optional.  If TEMPLATE_FIELD results
+in a null (empty) value, the template will result in default value of '_'.
+You may specify an alternate default value by appending ',DEFAULT' after
+template_field. Example: '{title,no_title}' would result in 'no_title' if the photo
+had no title. Example: '{created.year}/{place.address,NO_ADDRESS}' but there was 
+no address associated with the photo, the resulting output would be:
+'2020/NO_ADDRESS/photoname.jpg'. If specified, the default value may not
+contain a brace symbol ('{' or '}').
+
+Again, if you do not specify a default value and the template substitution has no
+value, '_' (underscore) will be used as the default value. For example, in the
+above example, this would result in '2020/_/photoname.jpg' if address was
+null.
+
+You may specify a null default (e.g. "" or empty string) by omitting the value
+after the comma, e.g. {title,} which would render to "" if title had no value thus
+effectively deleting the template from the resulting string.
+
+You may include other text in the template string outside the {}
+and use more than one template field in a single string, 
+e.g. '{created.year} - {created.month}' (e.g. '2020 - November').
+
+Some templates may resolve to more than one value.  For example, a photo can
+have multiple keywords so '{keyword}' can result in multiple values.  If used
+in a filename  or directory, these templates may result in more than one copy
+of the photo being exported.  For example, if photo has keywords "foo" and
+"bar", --directory '{keyword}' will result in  copies of the photo being
+exported to 'foo/image_name.jpeg' and 'bar/image_name.jpeg'.
+
+Some template fields such as '{media_type}' use the 'DEFAULT' value to allow
+customization  of the output. For example, '{media_type}' resolves to the
+special media type of the  photo such as 'panorama' or 'selfie'.  You may use
+the 'DEFAULT' value to override  these in form:
+'{media_type,video=vidéo;time_lapse=vidéo_accélérée}'.  In this example, if
+photo is a time_lapse photo, 'media_type' would resolve to  'vidéo_accélérée'
+instead of 'time_lapse' and video would resolve to 'vidéo' if photo is an
+ordinary video.
+
+With the --directory and --filename options you may specify a template for the
+export directory or filename, respectively. The directory will be appended to
+the export path specified in the export DEST argument to export. For example,
+if template is '{created.year}/{created.month}', and export destination DEST
+is '/Users/maria/Pictures/export', the actual export directory for a photo
+would be '/Users/maria/Pictures/export/2020/March' if the photo was created in
+March 2020.
+
+The templating system may also be used with the --keyword-template option to
+set keywords on export (with --exiftool or --sidecar), for example, to set a
+new keyword in format 'folder/subfolder/album' to preserve the folder/album
+structure, you can use --keyword-template "{folder_album}"
+
+In the template, valid template substitutions will be replaced by the
+corresponding value from the table below.  Invalid substitutions will result
+in an error.
+
+If you want the actual text of the template substition to appear in the
+rendered name, use double braces, e.g. '{{' or '}}', thus using
+'{created.year}/{{name}}' for --directory would result in output of
+2020/{name}/photoname.jpg
 """
        )
        formatter.write("\n")
@@ -1157,8 +1246,9 @@ def query(
        _list_libraries()
        return

+    photosdb = osxphotos.PhotosDB(dbfile=db, verbose=verbose_)
    photos = _query(
-        db=db,
+        photosdb=photosdb,
        keyword=keyword,
        person=person,
        album=album,
@@ -1255,8 +1345,10 @@ def query(
@click.option(
    "--export-as-hardlink",
    is_flag=True,
-    help="Hardlink files instead of copying them.  "
-    "Cannot be used with --exiftool which creates copies of the files with embedded EXIF data.",
+    help="Hardlink files instead of copying them. "
+    "Cannot be used with --exiftool which creates copies of the files with embedded EXIF data. "
+    "Note: on APFS volumes, files are cloned when exporting giving many of the same "
+    "advantages as hardlinks without having to use --export-as-hardlink.",
 )
@click.option(
    "--touch-file",
@@ -1383,6 +1475,12 @@ def query(
    "(video files only): QuickTime:CreationDate; QuickTime:CreateDate; QuickTime:ModifyDate (see also --ignore-date-modified); "
    "QuickTime:GPSCoordinates; UserData:GPSCoordinates.",
 )
+@click.option(
+    "--exiftool-path",
+    metavar="EXIFTOOL_PATH",
+    type=click.Path(exists=True),
+    help="Optionally specify path to exiftool; if not provided, will look for exiftool in $PATH.",
+)
@click.option(
    "--exiftool-option",
    multiple=True,
@@ -1447,6 +1545,33 @@ def query(
    '--description-template "{descr} exported with osxphotos on {today.date}" '
    "See Templating System below.",
 )
+@click.option(
+    "--finder-tag-template",
+    metavar="TEMPLATE",
+    multiple=True,
+    default=None,
+    help="Set MacOS Finder tags to TEMPLATE. These tags can be searched in the Finder or Spotlight with "
+    "'tag:tagname' format. For example, '--finder-tag-template \"{label}\"' to set Finder tags to photo labels. "
+    "You may specify multiple TEMPLATE values by using '--finder-tag-template' multiple times. "
+    "See also '--finder-tag-keywords and Extended Attributes below.'.",
+)
+@click.option(
+    "--finder-tag-keywords",
+    is_flag=True,
+    help="Set MacOS Finder tags to keywords; any keywords specified via '--keyword-template', '--person-keyword', etc. "
+    "will also be used as Finder tags. See also '--finder-tag-template and Extended Attributes below.'.",
+)
+@click.option(
+    "--xattr-template",
+    nargs=2,
+    metavar="ATTRIBUTE TEMPLATE",
+    multiple=True,
+    help="Set extended attribute ATTRIBUTE to TEMPLATE value. Valid attributes are: "
+    f"{', '.join(EXTENDED_ATTRIBUTE_NAMES_QUOTED)}. "
+    "For example, to set Finder comment to the photo's title and description: "
+    '\'--xattr-template findercomment "{title}; {descr}" '
+    "See Extended Attributes below for additional details on this option.",
+)
@click.option(
    "--directory",
    metavar="DIRECTORY",
@@ -1463,6 +1588,14 @@ def query(
    "File extension will be added automatically--do not include an extension in the FILENAME template. "
    "See below for additional details on templating system.",
 )
+@click.option(
+    "--strip",
+    is_flag=True,
+    help="Optionally strip leading and trailing whitespace from any rendered templates. "
+    'For example, if --filename template is "{title,} {original_name}" and image has no '
+    "title, resulting file would have a leading space but if used with --strip, this will "
+    "be removed.",
+)
@click.option(
    "--edited-suffix",
    metavar="SUFFIX",
@@ -1587,6 +1720,9 @@ def export(
    album_keyword,
    keyword_template,
    description_template,
+    finder_tag_template,
+    finder_tag_keywords,
+    xattr_template,
    current_name,
    convert_to_jpeg,
    jpeg_quality,
@@ -1601,6 +1737,7 @@ def export(
    download_missing,
    dest,
    exiftool,
+    exiftool_path,
    exiftool_option,
    exiftool_merge_keywords,
    exiftool_merge_persons,
@@ -1622,6 +1759,7 @@ def export(
    has_raw,
    directory,
    filename_template,
+    strip,
    edited_suffix,
    original_suffix,
    place,
@@ -1678,7 +1816,7 @@ def export(
            )
            raise click.Abort()

-        # re-set the local function vars to the corresponding config value
+        # re-set the local vars to the corresponding config value
        # this isn't elegant but avoids having to rewrite this function to use cfg.varname for every parameter
        db = cfg.db
        photos_library = cfg.photos_library
@@ -1722,6 +1860,9 @@ def export(
        album_keyword = cfg.album_keyword
        keyword_template = cfg.keyword_template
        description_template = cfg.description_template
+        finder_tag_template = cfg.finder_tag_template
+        finder_tag_keywords = cfg.finder_tag_keywords
+        xattr_template = cfg.xattr_template
        current_name = cfg.current_name
        convert_to_jpeg = cfg.convert_to_jpeg
        jpeg_quality = cfg.jpeg_quality
@@ -1735,6 +1876,7 @@ def export(
        not_live = cfg.not_live
        download_missing = cfg.download_missing
        exiftool = cfg.exiftool
+        exiftool_path = cfg.exiftool_path
        exiftool_option = cfg.exiftool_option
        exiftool_merge_keywords = cfg.exiftool_merge_keywords
        exiftool_merge_persons = cfg.exiftool_merge_persons
@@ -1756,6 +1898,7 @@ def export(
        has_raw = cfg.has_raw
        directory = cfg.directory
        filename_template = cfg.filename_template
+        strip = cfg.strip
        edited_suffix = cfg.edited_suffix
        original_suffix = cfg.original_suffix
        place = cfg.place
@@ -1835,6 +1978,19 @@ def export(
        )
        raise click.Abort()

+    if xattr_template:
+        for attr, _ in xattr_template:
+            if attr not in EXTENDED_ATTRIBUTE_NAMES:
+                click.echo(
+                    click.style(
+                        f"Invalid attribute '{attr}' for --xattr-template; "
+                        f"valid values are {', '.join(EXTENDED_ATTRIBUTE_NAMES_QUOTED)}",
+                        fg=CLI_COLOR_ERROR,
+                    ),
+                    err=True,
+                )
+                raise click.Abort()
+
    if save_config:
        verbose_(f"Saving options to file {save_config}")
        cfg.write_to_file(save_config)
@@ -1881,10 +2037,15 @@ def export(
        not x for x in [skip_edited, skip_bursts, skip_live, skip_raw]
    ]

-    # verify exiftool installed an in path
-    if exiftool:
+    # verify exiftool installed and in path if path not provided and exiftool will be used
+    # NOTE: this won't catch use of {exiftool:} in a template
+    # but those will raise error during template eval if exiftool path not set
+    if (
+        any([exiftool, exiftool_merge_keywords, exiftool_merge_persons])
+        and not exiftool_path
+    ):
        try:
-            _ = get_exiftool_path()
+            exiftool_path = get_exiftool_path()
        except FileNotFoundError:
            click.echo(
                click.style(
@@ -1896,6 +2057,9 @@ def export(
            )
            ctx.exit(2)

+    if any([exiftool, exiftool_merge_keywords, exiftool_merge_persons]):
+        verbose_(f"exiftool path: {exiftool_path}")
+
    isphoto = ismovie = True  # default searches for everything
    if only_movies:
        isphoto = False
@@ -1977,8 +2141,9 @@ def export(
                f"Upgraded export database {export_db_path} from version {upgraded[0]} to {upgraded[1]}"
            )

+    photosdb = osxphotos.PhotosDB(dbfile=db, verbose=verbose_, exiftool=exiftool_path)
    photos = _query(
-        db=db,
+        photosdb=photosdb,
        keyword=keyword,
        person=person,
        album=album,
@@ -2057,8 +2222,10 @@ def export(
        original_name = not current_name

        results = ExportResults()
-        if verbose:
-            for p in photos:
+        # send progress bar output to /dev/null if verbose to hide the progress bar
+        fp = open(os.devnull, "w") if verbose else None
+        with click.progressbar(photos, file=fp) as bar:
+            for p in bar:
                export_results = export_photo(
                    photo=p,
                    dest=dest,
@@ -2097,59 +2264,45 @@ def export(
                    ignore_date_modified=ignore_date_modified,
                    use_photokit=use_photokit,
                    exiftool_option=exiftool_option,
+                    strip=strip,
                )
                results += export_results

-                # if convert_to_jpeg and p.isphoto and p.uti != "public.jpeg":
-                #     for photo_file in set(
-                #         results.exported + results.updated + results.exif_updated
-                #     ):
-                #         verbose_(f"Converting {photo_file} to jpeg")
+                # all photo files (not including sidecars) that are part of this export set
+                # used below for applying Finder tags, etc.
+                photo_files = set(
+                    export_results.exported
+                    + export_results.new
+                    + export_results.updated
+                    + export_results.exif_updated
+                    + export_results.converted_to_jpeg
+                    + export_results.skipped
+                )

-        else:
-            # show progress bar
-            with click.progressbar(photos) as bar:
-                for p in bar:
-                    export_results = export_photo(
-                        photo=p,
-                        dest=dest,
-                        verbose=verbose,
-                        export_by_date=export_by_date,
-                        sidecar=sidecar,
-                        sidecar_drop_ext=sidecar_drop_ext,
-                        update=update,
-                        ignore_signature=ignore_signature,
-                        export_as_hardlink=export_as_hardlink,
-                        overwrite=overwrite,
-                        export_edited=export_edited,
-                        skip_original_if_edited=skip_original_if_edited,
-                        original_name=original_name,
-                        export_live=export_live,
-                        download_missing=download_missing,
-                        exiftool=exiftool,
-                        exiftool_merge_keywords=exiftool_merge_keywords,
-                        exiftool_merge_persons=exiftool_merge_persons,
-                        directory=directory,
-                        filename_template=filename_template,
-                        export_raw=export_raw,
+                if finder_tag_keywords or finder_tag_template:
+                    tags_written, tags_skipped = write_finder_tags(
+                        p,
+                        photo_files,
+                        keywords=finder_tag_keywords,
+                        keyword_template=keyword_template,
                        album_keyword=album_keyword,
                        person_keyword=person_keyword,
-                        keyword_template=keyword_template,
-                        description_template=description_template,
-                        export_db=export_db,
-                        fileutil=fileutil,
-                        dry_run=dry_run,
-                        touch_file=touch_file,
-                        edited_suffix=edited_suffix,
-                        original_suffix=original_suffix,
-                        use_photos_export=use_photos_export,
-                        convert_to_jpeg=convert_to_jpeg,
-                        jpeg_quality=jpeg_quality,
-                        ignore_date_modified=ignore_date_modified,
-                        use_photokit=use_photokit,
-                        exiftool_option=exiftool_option,
+                        exiftool_merge_keywords=exiftool_merge_keywords,
+                        finder_tag_template=finder_tag_template,
+                        strip=strip,
                    )
-                    results += export_results
+                    results.xattr_written.extend(tags_written)
+                    results.xattr_skipped.extend(tags_skipped)
+
+                if xattr_template:
+                    xattr_written, xattr_skipped = write_extended_attributes(
+                        p, photo_files, xattr_template, strip=strip
+                    )
+                    results.xattr_written.extend(xattr_written)
+                    results.xattr_skipped.extend(xattr_skipped)
+
+        if fp is not None:
+            fp.close()

        if cleanup:
            all_files = (
@@ -2168,6 +2321,8 @@ def export(
                # but was missing on --update doesn't get deleted
                # (better to have old version than none)
                + results.missing
+                # include files that have error in case they exist from previous export
+                + [r[0] for r in results.error]
                + [str(pathlib.Path(export_db_path).resolve())]
            )
            click.echo(f"Cleaning up {dest}")
@@ -2327,7 +2482,7 @@ def print_photo_info(photos, json=False):


 def _query(
-    db=None,
+    photosdb,
    keyword=None,
    person=None,
    album=None,
@@ -2386,12 +2541,12 @@ def _query(
    has_likes=False,
    no_likes=False,
 ):
-    """run a query against PhotosDB to extract the photos based on user supply criteria
-    used by query and export commands
-    arguments must be passed in same order as query and export
-    if either is modified, need to ensure all three functions are updated"""
+    """Run a query against PhotosDB to extract the photos based on user supply criteria used by query and export commands
+
+    Args:
+        photosdb: PhotosDB object
+    """

-    photosdb = osxphotos.PhotosDB(dbfile=db, verbose=verbose_)
    if deleted or deleted_only:
        photos = photosdb.photos(
            uuid=uuid,
@@ -2683,6 +2838,7 @@ def export_photo(
    ignore_date_modified=False,
    use_photokit=False,
    exiftool_option=None,
+    strip=False,
 ):
    """Helper function for export that does the actual export

@@ -2773,12 +2929,20 @@ def export_photo(
        if photo.hasadjustments and photo.path_edited is None:
            missing_edited = True

-    filenames = get_filenames_from_template(photo, filename_template, original_name)
+    filenames = get_filenames_from_template(
+        photo, filename_template, original_name, strip=strip
+    )
    for filename in filenames:
        if original_suffix:
-            rendered_suffix, unmatched = photo.render_template(
-                original_suffix, filename=True
-            )
+            try:
+                rendered_suffix, unmatched = photo.render_template(
+                    original_suffix, filename=True, strip=strip
+                )
+            except ValueError:
+                raise click.BadOptionUsage(
+                    "original_suffix",
+                    f"Invalid template for --original-suffix '{original_suffix}'",
+                )
            if not rendered_suffix or unmatched:
                raise click.BadOptionUsage(
                    "original_suffix",
@@ -2805,7 +2969,7 @@ def export_photo(
        )

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

        sidecar = [s.lower() for s in sidecar]
@@ -2835,7 +2999,19 @@ def export_photo(
            if export_original:
                if missing_original:
                    space = " " if not verbose else ""
-                    verbose_(f"{space}Skipping missing photo {photo.original_filename}")
+                    verbose_(
+                        f"{space}Skipping missing photo {photo.original_filename} ({photo.uuid})"
+                    )
+                    results.missing.append(
+                        str(pathlib.Path(dest_path) / original_filename)
+                    )
+                elif photo.intrash and (not photo.path or use_photos_export):
+                    # skip deleted files if they're missing or using use_photos_export
+                    # as AppleScript/PhotoKit cannot export deleted photos
+                    space = " " if not verbose else ""
+                    verbose_(
+                        f"{space}Skipping missing deleted photo {photo.original_filename} ({photo.uuid})"
+                    )
                    results.missing.append(
                        str(pathlib.Path(dest_path) / original_filename)
                    )
@@ -2884,6 +3060,14 @@ def export_photo(
                                ),
                                err=True,
                            )
+                        for error_ in export_results.error:
+                            click.echo(
+                                click.style(
+                                    f"Error exporting photo, file {error_[0]}: {error_[1]}",
+                                    fg=CLI_COLOR_ERROR,
+                                ),
+                                err=True,
+                            )

                    except Exception as e:
                        click.echo(
@@ -2894,7 +3078,7 @@ def export_photo(
                            err=True,
                        )
                        results.error.append(
-                            str(pathlib.Path(dest) / original_filename)
+                            (str(pathlib.Path(dest) / original_filename), e)
                        )
            else:
                verbose_(f"Skipping original version of {photo.original_filename}")
@@ -2902,9 +3086,6 @@ def export_photo(
            # if export-edited, also export the edited version
            # verify the photo has adjustments and valid path to avoid raising an exception
            if export_edited and photo.hasadjustments:
-                # if download_missing and the photo is missing or path doesn't exist,
-                # try to download with Photos
-
                edited_filename = pathlib.Path(filename)
                # check for correct edited suffix
                if photo.path_edited is not None:
@@ -2915,10 +3096,15 @@ def export_photo(
                    edited_ext = pathlib.Path(photo.filename).suffix

                if edited_suffix:
-                    rendered_suffix, unmatched = photo.render_template(
-                        edited_suffix, filename=True
-                    )
-
+                    try:
+                        rendered_suffix, unmatched = photo.render_template(
+                            edited_suffix, filename=True, strip=strip
+                        )
+                    except ValueError:
+                        raise click.BadOptionUsage(
+                            "edited_suffix",
+                            f"Invalid template for --edited-suffix '{edited_suffix}'",
+                        )
                    if not rendered_suffix or unmatched:
                        raise click.BadOptionUsage(
                            "edited_suffix",
@@ -2942,10 +3128,21 @@ def export_photo(
                )
                if missing_edited:
                    space = " " if not verbose else ""
-                    verbose_(f"{space}Skipping missing edited photo for {filename}")
+                    verbose_(f"{space}Skipping missing edited photo for {edited_filename}")
                    results.missing.append(
                        str(pathlib.Path(dest_path) / edited_filename)
                    )
+                elif photo.intrash and (not photo.path_edited or use_photos_export):
+                    # skip deleted files if they're missing or using use_photos_export
+                    # as AppleScript/PhotoKit cannot export deleted photos
+                    space = " " if not verbose else ""
+                    verbose_(
+                        f"{space}Skipping missing deleted photo {photo.original_filename} ({photo.uuid})"
+                    )
+                    results.missing.append(
+                        str(pathlib.Path(dest_path) / edited_filename )
+                    )
+
                else:
                    try:
                        export_results_edited = photo.export2(
@@ -2998,7 +3195,9 @@ def export_photo(
                            ),
                            err=True,
                        )
-                        results.error.append(str(pathlib.Path(dest) / edited_filename))
+                        results.error.append(
+                            (str(pathlib.Path(dest) / edited_filename), e)
+                        )

            if verbose:
                if update:
@@ -3017,7 +3216,7 @@ def export_photo(
    return results


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

    Args:
@@ -3033,9 +3232,14 @@ def get_filenames_from_template(photo, filename_template, original_name):
    """
    if filename_template:
        photo_ext = pathlib.Path(photo.original_filename).suffix
-        filenames, unmatched = photo.render_template(
-            filename_template, path_sep="_", filename=True
-        )
+        try:
+            filenames, unmatched = photo.render_template(
+                filename_template, path_sep="_", filename=True, strip=strip
+            )
+        except ValueError:
+            raise click.BadOptionUsage(
+                "filename_template", f"Invalid template '{filename_template}'"
+            )
        if not filenames or unmatched:
            raise click.BadOptionUsage(
                "filename_template",
@@ -3053,7 +3257,9 @@ def get_filenames_from_template(photo, filename_template, original_name):
    return filenames


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

    Args:
@@ -3080,7 +3286,12 @@ def get_dirnames_from_template(photo, directory, export_by_date, dest, dry_run):
        dest_paths = [dest_path]
    elif directory:
        # got a directory template, render it and check results are valid
-        dirnames, unmatched = photo.render_template(directory, dirname=True)
+        try:
+            dirnames, unmatched = photo.render_template(
+                directory, dirname=True, strip=strip
+            )
+        except ValueError:
+            raise click.BadOptionUsage("directory", f"Invalid template '{directory}'")
        if not dirnames or unmatched:
            raise click.BadOptionUsage(
                "directory",
@@ -3167,8 +3378,8 @@ def load_uuid_from_file(filename):

 def write_export_report(report_file, results):

-    """ write CSV report with results from export
-    
+    """write CSV report with results from export
+
    Args:
        report_file: path to report file
        results: ExportResults object
@@ -3190,9 +3401,11 @@ def write_export_report(report_file, results):
            "sidecar_json": 0,
            "sidecar_exiftool": 0,
            "missing": 0,
-            "error": 0,
+            "error": "",
            "exiftool_warning": "",
            "exiftool_error": "",
+            "extended_attributes_written": 0,
+            "extended_attributes_skipped": 0,
        }
        for result in results.all_files()
    }
@@ -3246,7 +3459,7 @@ def write_export_report(report_file, results):
        all_results[result]["missing"] = 1

    for result in results.error:
-        all_results[result]["error"] = 1
+        all_results[result[0]]["error"] = result[1]

    for result in results.exiftool_warning:
        all_results[result[0]]["exiftool_warning"] = result[1]
@@ -3254,6 +3467,12 @@ def write_export_report(report_file, results):
    for result in results.exiftool_error:
        all_results[result[0]]["exiftool_error"] = result[1]

+    for result in results.xattr_written:
+        all_results[result]["extended_attributes_written"] = 1
+
+    for result in results.xattr_skipped:
+        all_results[result]["extended_attributes_skipped"] = 1
+
    report_columns = [
        "filename",
        "exported",
@@ -3270,6 +3489,8 @@ def write_export_report(report_file, results):
        "error",
        "exiftool_warning",
        "exiftool_error",
+        "extended_attributes_written",
+        "extended_attributes_skipped",
    ]

    try:
@@ -3287,7 +3508,7 @@ def write_export_report(report_file, results):


 def cleanup_files(dest_path, files_to_keep, fileutil):
-    """ cleanup dest_path by deleting and files and empty directories 
+    """cleanup dest_path by deleting and files and empty directories
        not in files_to_keep

    Args:
@@ -3321,5 +3542,163 @@ def cleanup_files(dest_path, files_to_keep, fileutil):
    return (deleted_files, deleted_dirs)


+def write_finder_tags(
+    photo,
+    files,
+    keywords=False,
+    keyword_template=None,
+    album_keyword=None,
+    person_keyword=None,
+    exiftool_merge_keywords=None,
+    finder_tag_template=None,
+    strip=False,
+):
+    """Write Finder tags (extended attributes) to files; only writes attributes if attributes on file differ from what would be written
+
+    Args:
+        photo: a PhotoInfo object
+        files: list of file paths to write Finder tags to
+        keywords: if True, sets Finder tags to all keywords including any evaluated from keyword_template, album_keyword, person_keyword, exiftool_merge_keywords
+        keyword_template: list of keyword templates to evaluate for determining keywords
+        album_keyword: if True, use album names as keywords
+        person_keyword: if True, use person in image as keywords
+        exiftool_merge_keywords: if True, include any keywords in the exif data of the source image as keywords
+        finder_tag_template: list of templates to evaluate for determining Finder tags
+
+    Returns:
+        (list of file paths that were updated with new Finder tags, list of file paths skipped because Finder tags didn't need updating)
+    """
+
+    tags = []
+    written = []
+    skipped = []
+    if keywords:
+        # match whatever keywords would've been used in --exiftool or --sidecar
+        exif = photo._exiftool_dict(
+            use_albums_as_keywords=album_keyword,
+            use_persons_as_keywords=person_keyword,
+            keyword_template=keyword_template,
+            merge_exif_keywords=exiftool_merge_keywords,
+        )
+        try:
+            if exif["IPTC:Keywords"]:
+                tags.extend(exif["IPTC:Keywords"])
+        except KeyError:
+            pass
+
+    if finder_tag_template:
+        rendered_tags = []
+        for template_str in finder_tag_template:
+            try:
+                rendered, unmatched = photo.render_template(
+                    template_str,
+                    none_str=_OSXPHOTOS_NONE_SENTINEL,
+                    path_sep="/",
+                    strip=strip,
+                )
+            except ValueError:
+                raise click.BadOptionUsage(
+                    "finder_tag_template",
+                    f"Invalid template for --finder-tag-template': {template_str}",
+                )
+
+            if unmatched:
+                click.echo(
+                    click.style(
+                        f"Warning: unmatched template substitution for template: {template_str} {unmatched}",
+                        fg=CLI_COLOR_WARNING,
+                    ),
+                    err=True,
+                )
+            rendered_tags.extend(rendered)
+
+        # filter out any template values that didn't match by looking for sentinel
+        rendered_tags = [
+            tag for tag in rendered_tags if _OSXPHOTOS_NONE_SENTINEL not in tag
+        ]
+        tags.extend(rendered_tags)
+
+    tags = [osxmetadata.Tag(tag) for tag in set(tags)]
+    for f in files:
+        md = osxmetadata.OSXMetaData(f)
+        if sorted(md.tags) != sorted(tags):
+            verbose_(f"Writing Finder tags to {f}")
+            md.tags = tags
+            written.append(f)
+        else:
+            verbose_(f"Skipping Finder tags for {f}: nothing to do")
+            skipped.append(f)
+
+    return (written, skipped)
+
+
+def write_extended_attributes(photo, files, xattr_template, strip=False):
+    """ Writes extended attributes to exported files
+
+    Args:
+        photo: a PhotoInfo object
+        xattr_template: list of tuples: (attribute name, attribute template)
+    
+    Returns:
+        tuple(list of file paths that were updated with new attributes, list of file paths skipped because attributes didn't need updating)
+    """
+
+    attributes = {}
+    for xattr, template_str in xattr_template:
+        try:
+            rendered, unmatched = photo.render_template(
+                template_str,
+                none_str=_OSXPHOTOS_NONE_SENTINEL,
+                path_sep="/",
+                strip=strip,
+            )
+        except ValueError:
+            raise click.BadOptionUsage(
+                "xattr_template",
+                f"Invalid template for --xattr-template': {template_str}",
+            )
+        if unmatched:
+            click.echo(
+                click.style(
+                    f"Warning: unmatched template substitution for template: {template_str} {unmatched}",
+                    fg=CLI_COLOR_WARNING,
+                ),
+                err=True,
+            )
+        # filter out any template values that didn't match by looking for sentinel
+        rendered = [
+            value for value in rendered if _OSXPHOTOS_NONE_SENTINEL not in value
+        ]
+        try:
+            attributes[xattr].extend(rendered)
+        except KeyError:
+            attributes[xattr] = rendered
+
+    written = set()
+    skipped = set()
+    for f in files:
+        md = osxmetadata.OSXMetaData(f)
+        for attr, value in attributes.items():
+            islist = osxmetadata.ATTRIBUTES[attr].list
+            if value:
+                value = ", ".join(value) if not islist else sorted(value)
+            file_value = md.get_attribute(attr)
+
+            if file_value and islist:
+                file_value = sorted(file_value)
+
+            if (not file_value and not value) or file_value == value:
+                # if both not set or both equal, nothing to do
+                # get_attribute returns None if not set and value will be [] if not set so can't directly compare
+                verbose_(f"Skipping extended attribute {attr} for {f}: nothing to do")
+                skipped.add(f)
+            else:
+                verbose_(f"Writing extended attribute {attr} to {f}")
+                md.set_attribute(attr, value)
+                written.add(f)
+
+    return list(written), [f for f in skipped if f not in written]
+
+
 if __name__ == "__main__":
    cli()  # pylint: disable=no-value-for-parameter
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -108,7 +108,7 @@ SEARCH_CATEGORY_NEIGHBORHOOD = 3
 SEARCH_CATEGORY_LOCALITY_4 = 4
 SEARCH_CATEGORY_SUB_LOCALITY_5 = 5
 SEARCH_CATEGORY_SUB_LOCALITY_6 = 6
-SEARCH_CATEGORY_CITY = 7 
+SEARCH_CATEGORY_CITY = 7
 SEARCH_CATEGORY_LOCALITY_8 = 8
 SEARCH_CATEGORY_NAMED_AREA = 9
 SEARCH_CATEGORY_ALL_LOCALITY = [
@@ -182,4 +182,16 @@ CLI_COLOR_WARNING = "yellow"
 # Bit masks for --sidecar
 SIDECAR_JSON = 0x1
 SIDECAR_EXIFTOOL = 0x2
-SIDECAR_XMP = 0x4
+SIDECAR_XMP = 0x4
+
+# supported attributes for --xattr-template
+EXTENDED_ATTRIBUTE_NAMES = [
+    "authors",
+    "comment",
+    "copyright",
+    "description",
+    "findercomment",
+    "headline",
+    "keywords",
+]
+EXTENDED_ATTRIBUTE_NAMES_QUOTED = [f"'{x}'" for x in EXTENDED_ATTRIBUTE_NAMES]
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,5 +1,5 @@
 """ version info """

-__version__ = "0.38.18"
+__version__ = "0.39.11"


--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -9,11 +9,11 @@
 import json
 import logging
 import os
+import re
 import shutil
 import subprocess
 from functools import lru_cache  # pylint: disable=syntax-error

-
 # exiftool -stay_open commands outputs this EOF marker after command is run
 EXIFTOOL_STAYOPEN_EOF = "{ready}"
 EXIFTOOL_STAYOPEN_EOF_LEN = len(EXIFTOOL_STAYOPEN_EOF)
@@ -33,8 +33,8 @@ def get_exiftool_path():


 class _ExifToolProc:
-    """ Runs exiftool in a subprocess via Popen
-        Creates a singleton object """
+    """Runs exiftool in a subprocess via Popen
+    Creates a singleton object"""

    def __new__(cls, *args, **kwargs):
        """ create new object or return instance of already created singleton """
@@ -44,20 +44,20 @@ class _ExifToolProc:
        return cls.instance

    def __init__(self, exiftool=None):
-        """ construct _ExifToolProc singleton object or return instance of already created object
-            exiftool: optional path to exiftool binary (if not provided, will search path to find it) """
+        """construct _ExifToolProc singleton object or return instance of already created object
+        exiftool: optional path to exiftool binary (if not provided, will search path to find it)"""

        if hasattr(self, "_process_running") and self._process_running:
            # already running
-            if exiftool is not None:
+            if exiftool is not None and exiftool != self._exiftool:
                logging.warning(
                    f"exiftool subprocess already running, "
                    f"ignoring exiftool={exiftool}"
                )
            return

-        self._exiftool = exiftool or get_exiftool_path()
        self._process_running = False
+        self._exiftool = exiftool or get_exiftool_path()
        self._start_proc()

    @property
@@ -106,8 +106,8 @@ class _ExifToolProc:

    def _stop_proc(self):
        """ stop the exiftool process if it's running, otherwise, do nothing """
+
        if not self._process_running:
-            logging.warning("exiftool process is not running")
            return

        self._process.stdin.write(b"-stay_open\n")
@@ -133,7 +133,7 @@ class ExifTool:
    """ Basic exiftool interface for reading and writing EXIF tags """

    def __init__(self, filepath, exiftool=None, overwrite=True, flags=None):
-        """ Create ExifTool object
+        """Create ExifTool object

        Args:
            file: path to image file
@@ -157,15 +157,15 @@ class ExifTool:
        self._read_exif()

    def setvalue(self, tag, value):
-        """ Set tag to value(s); if value is None, will delete tag
+        """Set tag to value(s); if value is None, will delete tag

        Args:
            tag: str; name of tag to set
            value: str; value to set tag to
-        
+
        Returns:
            True if success otherwise False
-            
+
            If error generated by exiftool, returns False and sets self.error to error string
            If warning generated by exiftool, returns True (unless there was also an error) and sets self.warning to warning string
            If called in context manager, returns True (execution is delayed until exiting context manager)
@@ -184,26 +184,26 @@ class ExifTool:
            return error is None

    def addvalues(self, tag, *values):
-        """ Add one or more value(s) to tag
+        """Add one or more value(s) to tag
            If more than one value is passed, each value will be added to the tag

        Args:
            tag: str; tag to set
            *values: str; one or more values to set
-        
+
        Returns:
            True if success otherwise False
-            
+
            If error generated by exiftool, returns False and sets self.error to error string
            If warning generated by exiftool, returns True (unless there was also an error) and sets self.warning to warning string
            If called in context manager, returns True (execution is delayed until exiting context manager)
-            
+
        Notes: exiftool may add duplicate values for some tags so the caller must ensure
               the values being added are not already in the EXIF data
-               For some tags, such as IPTC:Keywords, this will add a new value to the list of keywords, 
+               For some tags, such as IPTC:Keywords, this will add a new value to the list of keywords,
               but for others, such as EXIF:ISO, this will literally add a value to the existing value.
               It's up to the caller to know what exiftool will do for each tag
-               If setvalue called before addvalues, exiftool does not appear to add duplicates, 
+               If setvalue called before addvalues, exiftool does not appear to add duplicates,
               but if addvalues called without first calling setvalue, exiftool will add duplicate values
        """
        if not values:
@@ -226,7 +226,7 @@ class ExifTool:
            return error is None

    def run_commands(self, *commands, no_file=False):
-        """ Run commands in the exiftool process and return result.
+        """Run commands in the exiftool process and return result.

        Args:
                *commands: exiftool commands to run
@@ -266,7 +266,7 @@ class ExifTool:
            + b"\n"
            + b"-execute\n"
        )
-        
+
        # send the command
        self._process.stdin.write(command_str)
        self._process.stdin.flush()
@@ -300,17 +300,28 @@ class ExifTool:
        ver, _, _ = self.run_commands("-ver", no_file=True)
        return ver.decode("utf-8")

-    def asdict(self):
-        """ return dictionary of all EXIF tags and values from exiftool 
-            returns empty dict if no tags
+    def asdict(self, tag_groups=True):
+        """return dictionary of all EXIF tags and values from exiftool
+        returns empty dict if no tags
+
+        Args:
+            tag_groups: if True (default), dict keys have tag groups, e.g. "IPTC:Keywords"; if False, drops groups from keys, e.g. "Keywords"
        """
        json_str, _, _ = self.run_commands("-json")
-        if json_str:
-            exifdict = json.loads(json_str)
-            return exifdict[0]
-        else:
+        if not json_str:
            return dict()

+        exifdict = json.loads(json_str)
+        exifdict = exifdict[0]
+        if not tag_groups:
+            # strip tag groups
+            exif_new = {}
+            for k, v in exifdict.items():
+                k = re.sub(r".*:", "", k)
+                exif_new[k] = v
+            exifdict = exif_new
+        return exifdict
+
    def json(self):
        """ returns JSON string containing all EXIF tags and values from exiftool """
        json, _, _ = self.run_commands("-json")
--- a/osxphotos/imageconverter.py
+++ b/osxphotos/imageconverter.py
@@ -4,7 +4,6 @@

 # reference: https://stackoverflow.com/questions/59330149/coreimage-ciimage-write-jpg-is-shifting-colors-macos/59334308#59334308

-import logging
 import pathlib

 import Metal
@@ -16,6 +15,11 @@ from Foundation import NSDictionary
 from wurlitzer import pipes


+class ImageConversionError(Exception):
+    """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
@@ -60,6 +64,7 @@ class ImageConverter:
        Raises:
            ValueError if compression quality not in range 0.0 to 1.0
            FileNotFoundError if input_path doesn't exist
+            ImageConversionError if error during conversion
        """

        # accept input_path or output_path as pathlib.Path
@@ -89,8 +94,7 @@ class ImageConverter:
            input_image = Quartz.CIImage.imageWithContentsOfURL_(input_url)

        if input_image is None:
-            logging.debug(f"Could not create CIImage for {input_path}")
-            return False
+            raise ImageConversionError(f"Could not create CIImage for {input_path}")

        output_colorspace = input_image.colorSpace() or Quartz.CGColorSpaceCreateWithName(
            Quartz.CoreGraphics.kCGColorSpaceSRGB
@@ -105,8 +109,7 @@ class ImageConverter:
        if not error:
            return True
        else:
-            logging.debug(
+            raise ImageConversionError(
                "Error converting file {input_path} to jpeg at {output_path}: {error}"
            )
-            return False

--- a/osxphotos/photoinfo/_photoinfo_exiftool.py
+++ b/osxphotos/photoinfo/_photoinfo_exiftool.py
@@ -18,12 +18,11 @@ def exiftool(self):
        return self._exiftool
    except AttributeError:
        try:
-            exiftool_path = get_exiftool_path()
+            exiftool_path = self._db._exiftool_path or get_exiftool_path()
            if self.path is not None and os.path.isfile(self.path):
-                exiftool = ExifTool(self.path)
+                exiftool = ExifTool(self.path, exiftool=exiftool_path)
            else:
                exiftool = None
-                logging.debug(f"exiftool: missing path {self.uuid}")
        except FileNotFoundError:
            # get_exiftool_path raises FileNotFoundError if exiftool not found
            exiftool = None
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -52,6 +52,12 @@ from ..photokit import (
 from ..utils import dd_to_dms_str, findfiles, noop


+class ExportError(Exception):
+    """ error during export """
+
+    pass
+
+
 class ExportResults:
    """ holds export results for export2 """

@@ -74,6 +80,8 @@ class ExportResults:
        error=None,
        exiftool_warning=None,
        exiftool_error=None,
+        xattr_written=None,
+        xattr_skipped=None,
    ):
        self.exported = exported or []
        self.new = new or []
@@ -92,6 +100,8 @@ class ExportResults:
        self.error = error or []
        self.exiftool_warning = exiftool_warning or []
        self.exiftool_error = exiftool_error or []
+        self.xattr_written = xattr_written or []
+        self.xattr_skipped = xattr_skipped or []

    def all_files(self):
        """ return all filenames contained in results """
@@ -110,10 +120,10 @@ class ExportResults:
            + self.sidecar_xmp_written
            + self.sidecar_xmp_skipped
            + self.missing
-            + self.error
        )
        files += [x[0] for x in self.exiftool_warning]
        files += [x[0] for x in self.exiftool_error]
+        files += [x[0] for x in self.error]

        files = list(set(files))
        return files
@@ -184,56 +194,33 @@ def _export_photo_uuid_applescript(
 ):
    """Export photo to dest path using applescript to control Photos
    If photo is a live photo, exports both the photo and associated .mov file
-    uuid: UUID of photo to export
-    dest: destination path to export to
-    filestem: (string) if provided, exported filename will be named stem.ext
-              where ext is extension of the file exported by photos (e.g. .jpeg, .mov, etc)
-              If not provided, file will be named with whatever name Photos uses
-              If filestem.ext exists, it wil be overwritten
-    original: (boolean) if True, export original image; default = True
-    edited: (boolean) if True, export edited photo; default = False
-            If photo not edited and edited=True, will still export the original image
-            caller must verify image has been edited
-    *Note*: must be called with either edited or original but not both,
-            will raise error if called with both edited and original = True
-    live_photo: (boolean) if True, export associated .mov live photo; default = False
-    timeout: timeout value in seconds; export will fail if applescript run time exceeds timeout
-    burst: (boolean) set to True if file is a burst image to avoid Photos export error
-    dry_run: (boolean) set to True to run in "dry run" mode which will download file but not actually copy to destination
+
+    Args:
+        uuid: UUID of photo to export
+        dest: destination path to export to
+        filestem: (string) if provided, exported filename will be named stem.ext
+                where ext is extension of the file exported by photos (e.g. .jpeg, .mov, etc)
+                If not provided, file will be named with whatever name Photos uses
+                If filestem.ext exists, it wil be overwritten
+        original: (boolean) if True, export original image; default = True
+        edited: (boolean) if True, export edited photo; default = False
+                If photo not edited and edited=True, will still export the original image
+                caller must verify image has been edited
+        *Note*: must be called with either edited or original but not both,
+                will raise error if called with both edited and original = True
+        live_photo: (boolean) if True, export associated .mov live photo; default = False
+        timeout: timeout value in seconds; export will fail if applescript run time exceeds timeout
+        burst: (boolean) set to True if file is a burst image to avoid Photos export error
+        dry_run: (boolean) set to True to run in "dry run" mode which will download file but not actually copy to destination
+
    Returns: list of paths to exported file(s) or None if export failed
+
+    Raises: ExportError if error during export
+
    Note: For Live Photos, if edited=True, will export a jpeg but not the movie, even if photo
          has not been edited. This is due to how Photos Applescript interface works.
    """

-    # setup the applescript to do the export
-    # export_scpt = AppleScript(
-    #     """
-    # 	on export_by_uuid(theUUID, thePath, original, edited, theTimeOut)
-    # 		tell application "Photos"
-    # 			set thePath to thePath
-    # 			set theItem to media item id theUUID
-    # 			set theFilename to filename of theItem
-    # 			set itemList to {theItem}
-
-    # 			if original then
-    # 				with timeout of theTimeOut seconds
-    # 					export itemList to POSIX file thePath with using originals
-    # 				end timeout
-    # 			end if
-
-    # 			if edited then
-    # 				with timeout of theTimeOut seconds
-    # 					export itemList to POSIX file thePath
-    # 				end timeout
-    # 			end if
-
-    # 			return theFilename
-    # 		end tell
-
-    # 	end export_by_uuid
-    # 	"""
-    # )
-
    dest = pathlib.Path(dest)
    if not dest.is_dir():
        raise ValueError(f"dest {dest} must be a directory")
@@ -249,12 +236,8 @@ def _export_photo_uuid_applescript(
        photo = photoscript.Photo(uuid)
        filename = photo.filename
        exported_files = photo.export(tmpdir.name, original=original, timeout=timeout)
-        # filename = export_scpt.call(
-        #     "export_by_uuid", uuid, tmpdir.name, original, edited, timeout
-        # )
    except Exception as e:
-        logging.warning(f"Error exporting uuid {uuid}: {e}")
-        return None
+        raise ExportError(e)

    if exported_files and filename:
        # need to find actual filename as sometimes Photos renames JPG to jpeg on export
@@ -523,6 +506,7 @@ def export2(
        "sidecar_xmp_skipped",
        "missing",
        "error",
+        "error_str",
        "exiftool_warning",
        "exiftool_error",

@@ -549,24 +533,6 @@ def export2(
    # e.g. name will be filename_edited.jpg
    edited_identifier = "_edited"

-    # list of all files exported during this call to export
-    exported_files = []
-
-    # list of new files during update
-    update_new_files = []
-
-    # list of files that were updated
-    update_updated_files = []
-
-    # list of all files skipped because they do not need to be updated (for use with update=True)
-    update_skipped_files = []
-
-    # list of all files with utime touched (touch_file = True)
-    touched_files = []
-
-    # list of all files convereted to jpeg
-    converted_to_jpeg_files = []
-
    # check edited and raise exception trying to export edited version of
    # photo that hasn't been edited
    if edited and not self.hasadjustments:
@@ -641,6 +607,7 @@ def export2(
            f"destination exists ({dest}); overwrite={overwrite}, increment={increment}"
        )

+    all_results = ExportResults()
    if not use_photos_export:
        # find the source file on disk and export
        # get path to source file and verify it's not None and is valid file
@@ -734,12 +701,7 @@ def export2(
            jpeg_quality=jpeg_quality,
            ignore_signature=ignore_signature,
        )
-        exported_files = results.exported
-        update_new_files = results.new
-        update_updated_files = results.updated
-        update_skipped_files = results.skipped
-        touched_files = results.touched
-        converted_to_jpeg_files = results.converted_to_jpeg
+        all_results += results

        # copy live photo associated .mov if requested
        if live_photo and self.live_photo:
@@ -760,12 +722,7 @@ def export2(
                    fileutil=fileutil,
                    ignore_signature=ignore_signature,
                )
-                exported_files.extend(results.exported)
-                update_new_files.extend(results.new)
-                update_updated_files.extend(results.updated)
-                update_skipped_files.extend(results.skipped)
-                touched_files.extend(results.touched)
-                converted_to_jpeg_files.extend(results.converted_to_jpeg)
+                all_results += results

        # copy associated RAW image if requested
        if raw_photo and self.has_raw:
@@ -787,15 +744,9 @@ def export2(
                    jpeg_quality=jpeg_quality,
                    ignore_signature=ignore_signature,
                )
-                exported_files.extend(results.exported)
-                update_new_files.extend(results.new)
-                update_updated_files.extend(results.updated)
-                update_skipped_files.extend(results.skipped)
-                touched_files.extend(results.touched)
-                converted_to_jpeg_files.extend(results.converted_to_jpeg)
+                all_results += results
    else:
        # use_photo_export
-        exported = []
        # export live_photo .mov file?
        live_photo = True if live_photo and self.live_photo else False
        if edited or self.shared:
@@ -815,7 +766,7 @@ def export2(
                photo = None
                try:
                    photo = photolib.fetch_uuid(self.uuid)
-                except PhotoKitFetchFailed:
+                except PhotoKitFetchFailed as e:
                    # if failed to find UUID, might be a burst photo
                    if self.burst and self._info["burstUUID"]:
                        bursts = photolib.fetch_burst_uuid(
@@ -824,24 +775,37 @@ def export2(
                        # PhotoKit UUIDs may contain "/L0/001" so only look at beginning
                        photo = [p for p in bursts if p.uuid.startswith(self.uuid)]
                        photo = photo[0] if photo else None
+                    if not photo:
+                        all_results.error.append(
+                            (
+                                str(dest),
+                                f"PhotoKitFetchFailed exception exporting photo {self.uuid}: {e}",
+                            )
+                        )
                if photo:
-                    exported = photo.export(
-                        dest.parent, dest.name, version=PHOTOS_VERSION_CURRENT
-                    )
-                else:
-                    exported = []
+                    try:
+                        exported = photo.export(
+                            dest.parent, dest.name, version=PHOTOS_VERSION_CURRENT
+                        )
+                        all_results.exported.extend(exported)
+                    except Exception as e:
+                        all_results.error.append((str(dest), e))
            else:
-                exported = _export_photo_uuid_applescript(
-                    self.uuid,
-                    dest.parent,
-                    filestem=filestem,
-                    original=False,
-                    edited=True,
-                    live_photo=live_photo,
-                    timeout=timeout,
-                    burst=self.burst,
-                    dry_run=dry_run,
-                )
+                try:
+                    exported = _export_photo_uuid_applescript(
+                        self.uuid,
+                        dest.parent,
+                        filestem=filestem,
+                        original=False,
+                        edited=True,
+                        live_photo=live_photo,
+                        timeout=timeout,
+                        burst=self.burst,
+                        dry_run=dry_run,
+                    )
+                    all_results.exported.extend(exported)
+                except ExportError as e:
+                    all_results.error.append((str(dest), e))
        else:
            # export original version and not edited
            filestem = dest.stem
@@ -860,37 +824,40 @@ def export2(
                        photo = [p for p in bursts if p.uuid.startswith(self.uuid)]
                        photo = photo[0] if photo else None
                if photo:
-                    exported = photo.export(
-                        dest.parent, dest.name, version=PHOTOS_VERSION_ORIGINAL
-                    )
-                else:
-                    exported = []
+                    try:
+                        exported = photo.export(
+                            dest.parent, dest.name, version=PHOTOS_VERSION_ORIGINAL
+                        )
+                        all_results.exported.extend(exported)
+                    except Exception as e:
+                        all_results.error.append((str(dest), e))
            else:
-                exported = _export_photo_uuid_applescript(
-                    self.uuid,
-                    dest.parent,
-                    filestem=filestem,
-                    original=True,
-                    edited=False,
-                    live_photo=live_photo,
-                    timeout=timeout,
-                    burst=self.burst,
-                    dry_run=dry_run,
-                )
-        if exported:
+                try:
+                    exported = _export_photo_uuid_applescript(
+                        self.uuid,
+                        dest.parent,
+                        filestem=filestem,
+                        original=True,
+                        edited=False,
+                        live_photo=live_photo,
+                        timeout=timeout,
+                        burst=self.burst,
+                        dry_run=dry_run,
+                    )
+                    all_results.exported.extend(exported)
+                except ExportError as e:
+                    all_results.error.append((str(dest), e))
+        if all_results.exported:
            if touch_file:
-                for exported_file in exported:
-                    touched_files.append(exported_file)
+                for exported_file in all_results.exported:
+                    all_results.touched.append(exported_file)
                    ts = int(self.date.timestamp())
                    fileutil.utime(exported_file, (ts, ts))
-            exported_files.extend(exported)
            if update:
-                update_new_files.extend(exported)
+                all_results.new.extend(all_results.exported)

-        else:
-            logging.warning(
-                f"Error exporting photo {self.uuid} to {dest} with use_photos_export"
-            )
+        # else:
+        # all_results.error.append((str(dest), f"Error exporting photo {self.uuid} to {dest} with use_photos_export"))

    # export metadata
    sidecars = []
@@ -912,6 +879,7 @@ def export2(
            ignore_date_modified=ignore_date_modified,
            merge_exif_keywords=merge_exif_keywords,
            merge_exif_persons=merge_exif_persons,
+            filename=dest.name,
        )
        sidecars.append(
            (
@@ -934,6 +902,7 @@ def export2(
            tag_groups=False,
            merge_exif_keywords=merge_exif_keywords,
            merge_exif_persons=merge_exif_persons,
+            filename=dest.name,
        )
        sidecars.append(
            (
@@ -1000,14 +969,10 @@ def export2(

    # if exiftool, write the metadata
    if update:
-        exif_files = update_new_files + update_updated_files + update_skipped_files
+        exif_files = all_results.new + all_results.updated + all_results.skipped
    else:
-        exif_files = exported_files
+        exif_files = all_results.exported

-    exif_files_updated = []
-    exiftool_warning = []
-    exiftool_error = []
-    errors = []
    # TODO: remove duplicative code from below
    if exiftool and update and exif_files:
        for exported_file in exif_files:
@@ -1046,10 +1011,10 @@ def export2(
                        merge_exif_persons=merge_exif_persons,
                    )
                    if warning_:
-                        exiftool_warning.append((exported_file, warning_))
+                        all_results.exiftool_warning.append((exported_file, warning_))
                    if error_:
-                        exiftool_error.append((exported_file, error_))
-                        errors.append(exported_file)
+                        all_results.exiftool_error.append((exported_file, error_))
+                        all_results.error.append((exported_file, error_))

                export_db.set_exifdata_for_file(
                    exported_file,
@@ -1066,7 +1031,7 @@ def export2(
                export_db.set_stat_exif_for_file(
                    exported_file, fileutil.file_sig(exported_file)
                )
-                exif_files_updated.append(exported_file)
+                all_results.exif_updated.append(exported_file)
            else:
                verbose(f"Skipped up to date exiftool metadata for {exported_file}")
    elif exiftool and exif_files:
@@ -1085,10 +1050,10 @@ def export2(
                    merge_exif_persons=merge_exif_persons,
                )
                if warning_:
-                    exiftool_warning.append((exported_file, warning_))
+                    all_results.exiftool_warning.append((exported_file, warning_))
                if error_:
-                    exiftool_error.append((exported_file, error_))
-                    errors.append(exported_file)
+                    all_results.exiftool_error.append((exported_file, error_))
+                    all_results.error.append((exported_file, error_))

            export_db.set_exifdata_for_file(
                exported_file,
@@ -1105,36 +1070,25 @@ def export2(
            export_db.set_stat_exif_for_file(
                exported_file, fileutil.file_sig(exported_file)
            )
-            exif_files_updated.append(exported_file)
+            all_results.exif_updated.append(exported_file)

    if touch_file:
-        for exif_file in exif_files_updated:
+        for exif_file in all_results.exif_updated:
            verbose(f"Updating file modification time for {exif_file}")
-            touched_files.append(exif_file)
+            all_results.touched.append(exif_file)
            ts = int(self.date.timestamp())
            fileutil.utime(exif_file, (ts, ts))

-    touched_files = list(set(touched_files))
+    all_results.touched = list(set(all_results.touched))

-    results = ExportResults(
-        exported=exported_files,
-        new=update_new_files,
-        updated=update_updated_files,
-        skipped=update_skipped_files,
-        exif_updated=exif_files_updated,
-        touched=touched_files,
-        converted_to_jpeg=converted_to_jpeg_files,
-        sidecar_json_written=sidecar_json_files_written,
-        sidecar_json_skipped=sidecar_json_files_skipped,
-        sidecar_exiftool_written=sidecar_exiftool_files_written,
-        sidecar_exiftool_skipped=sidecar_exiftool_files_skipped,
-        sidecar_xmp_written=sidecar_xmp_files_written,
-        sidecar_xmp_skipped=sidecar_xmp_files_skipped,
-        error=errors,
-        exiftool_error=exiftool_error,
-        exiftool_warning=exiftool_warning,
-    )
-    return results
+    all_results.sidecar_json_written = sidecar_json_files_written
+    all_results.sidecar_json_skipped = sidecar_json_files_skipped
+    all_results.sidecar_exiftool_written = sidecar_exiftool_files_written
+    all_results.sidecar_exiftool_skipped = sidecar_exiftool_files_skipped
+    all_results.sidecar_xmp_written = sidecar_xmp_files_written
+    all_results.sidecar_xmp_skipped = sidecar_xmp_files_skipped
+
+    return all_results


 def _export_photo(
@@ -1356,7 +1310,7 @@ def _write_exif_data(
        merge_exif_persons=merge_exif_persons,
    )

-    with ExifTool(filepath, flags=flags) as exiftool:
+    with ExifTool(filepath, flags=flags, exiftool=self._db._exiftool_path) as exiftool:
        for exiftag, val in exif_info.items():
            if type(val) == list:
                for v in val:
@@ -1375,11 +1329,13 @@ def _exiftool_dict(
    ignore_date_modified=False,
    merge_exif_keywords=False,
    merge_exif_persons=False,
+    filename=None,
 ):
    """Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.
        Does not include all the EXIF fields as those are likely already in the image.

    Args:
+        filename: name of source image file (without path); if not None, exiftool JSON signature will be included; if None, signature will not be included
        use_albums_as_keywords: treat album names as keywords
        use_persons_as_keywords: treat person names as keywords
        keyword_template: (list of strings); list of template strings to render as keywords
@@ -1413,7 +1369,16 @@ def _exiftool_dict(
        UserData:GPSCoordinates
    """

-    exif = {}
+    exif = (
+        {
+            "SourceFile": filename,
+            "ExifTool:ExifToolVersion": "12.00",
+            "File:FileName": filename,
+        }
+        if filename is not None
+        else {}
+    )
+
    if description_template is not None:
        rendered = self.render_template(
            description_template, expand_inplace=True, inplace_sep=", "
@@ -1483,7 +1448,7 @@ def _exiftool_dict(

    if keyword_list:
        # remove duplicates
-        keyword_list = sorted(list(set(keyword_list)))
+        keyword_list = sorted(list(set([str(keyword) for keyword in keyword_list])))
        exif["IPTC:Keywords"] = keyword_list.copy()
        exif["XMP:Subject"] = keyword_list.copy()
        exif["XMP:TagsList"] = keyword_list.copy()
@@ -1579,6 +1544,7 @@ def _get_exif_keywords(self):
                kw = exifdict[field]
                if kw and type(kw) != list:
                    kw = [kw]
+                kw = [str(k) for k in kw]
                keywords.extend(kw)
            except KeyError:
                pass
@@ -1595,6 +1561,7 @@ def _get_exif_persons(self):
            p = exifdict["XMP:PersonInImage"]
            if p and type(p) != list:
                p = [p]
+            p = [str(p_) for p_ in p]
            persons.extend(p)
        except KeyError:
            pass
@@ -1611,6 +1578,7 @@ def _exiftool_json_sidecar(
    tag_groups=True,
    merge_exif_keywords=False,
    merge_exif_persons=False,
+    filename=None,
 ):
    """Return dict of EXIF details for building exiftool JSON sidecar or sending commands to ExifTool.
        Does not include all the EXIF fields as those are likely already in the image.
@@ -1624,6 +1592,7 @@ def _exiftool_json_sidecar(
        tag_groups: if True, tags are in form Group:TagName, e.g. IPTC:Keywords, otherwise group name is omitted, e.g. Keywords
        merge_exif_keywords: boolean; if True, merged keywords found in file's exif data (requires exiftool)
        merge_exif_persons: boolean; if True, merged persons found in file's exif data (requires exiftool)
+        filename: filename of the destination image file for including in exiftool signature in JSON sidecar

    Returns: dict with exiftool tags / values

@@ -1657,6 +1626,7 @@ def _exiftool_json_sidecar(
        ignore_date_modified=ignore_date_modified,
        merge_exif_keywords=merge_exif_keywords,
        merge_exif_persons=merge_exif_persons,
+        filename=filename,
    )

    if not tag_groups:
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -86,8 +86,8 @@ class PhotoInfo:

    @property
    def original_filename(self):
-        """ original filename of the picture 
-            Photos 5 mangles filenames upon import """
+        """original filename of the picture
+        Photos 5 mangles filenames upon import"""
        if (
            self._db._db_version <= _PHOTOS_4_VERSION
            and self.has_raw
@@ -106,8 +106,8 @@ class PhotoInfo:

    @property
    def date_modified(self):
-        """ image modification date as timezone aware datetime object
-            or None if no modification date set """
+        """image modification date as timezone aware datetime object
+        or None if no modification date set"""

        # Photos <= 4 provides no way to get date of adjustment and will update
        # lastmodifieddate anytime photo database record is updated (e.g. adding tags)
@@ -492,9 +492,9 @@ class PhotoInfo:

    @property
    def ismissing(self):
-        """ returns true if photo is missing from disk (which means it's not been downloaded from iCloud) 
+        """returns true if photo is missing from disk (which means it's not been downloaded from iCloud)
        NOTE:   the photos.db database uses an asynchrounous write-ahead log so changes in Photos
-                do not immediately get written to disk. In particular, I've noticed that downloading 
+                do not immediately get written to disk. In particular, I've noticed that downloading
                an image from the cloud does not force the database to be updated until something else
                e.g. an edit, keyword, etc. occurs forcing a database synch
                The exact process / timing is a mystery to be but be aware that if some photos were recently
@@ -539,8 +539,8 @@ class PhotoInfo:

    @property
    def shared(self):
-        """ returns True if photos is in a shared iCloud album otherwise false
-            Only valid on Photos 5; returns None on older versions """
+        """returns True if photos is in a shared iCloud album otherwise false
+        Only valid on Photos 5; returns None on older versions"""
        if self._db._db_version > _PHOTOS_4_VERSION:
            return self._info["shared"]
        else:
@@ -548,8 +548,8 @@ class PhotoInfo:

    @property
    def uti(self):
-        """ Returns Uniform Type Identifier (UTI) for the image
-            for example: public.jpeg or com.apple.quicktime-movie
+        """Returns Uniform Type Identifier (UTI) for the image
+        for example: public.jpeg or com.apple.quicktime-movie
        """
        if self._db._db_version <= _PHOTOS_4_VERSION:
            if self.hasadjustments:
@@ -564,8 +564,8 @@ class PhotoInfo:

    @property
    def uti_original(self):
-        """ Returns Uniform Type Identifier (UTI) for the original image
-            for example: public.jpeg or com.apple.quicktime-movie
+        """Returns Uniform Type Identifier (UTI) for the original image
+        for example: public.jpeg or com.apple.quicktime-movie
        """
        if self._db._db_version <= _PHOTOS_4_VERSION and self._info["has_raw"]:
            return self._info["raw_pair_info"]["UTI"]
@@ -577,9 +577,9 @@ class PhotoInfo:

    @property
    def uti_edited(self):
-        """ Returns Uniform Type Identifier (UTI) for the edited image 
-            if the photo has been edited, otherwise None; 
-            for example: public.jpeg 
+        """Returns Uniform Type Identifier (UTI) for the edited image
+        if the photo has been edited, otherwise None;
+        for example: public.jpeg
        """
        if self._db._db_version >= _PHOTOS_5_VERSION:
            return self.uti if self.hasadjustments else None
@@ -588,36 +588,34 @@ class PhotoInfo:

    @property
    def uti_raw(self):
-        """ Returns Uniform Type Identifier (UTI) for the RAW image if there is one
-            for example: com.canon.cr2-raw-image
-            Returns None if no associated RAW image
+        """Returns Uniform Type Identifier (UTI) for the RAW image if there is one
+        for example: com.canon.cr2-raw-image
+        Returns None if no associated RAW image
        """
        return self._info["UTI_raw"]

    @property
    def ismovie(self):
-        """ Returns True if file is a movie, otherwise False
-        """
+        """Returns True if file is a movie, otherwise False"""
        return True if self._info["type"] == _MOVIE_TYPE else False

    @property
    def isphoto(self):
-        """ Returns True if file is an image, otherwise False
-        """
+        """Returns True if file is an image, otherwise False"""
        return True if self._info["type"] == _PHOTO_TYPE else False

    @property
    def incloud(self):
-        """ Returns True if photo is cloud asset and is synched to cloud
-                    False if photo is cloud asset and not yet synched to cloud
-                    None if photo is not cloud asset
+        """Returns True if photo is cloud asset and is synched to cloud
+        False if photo is cloud asset and not yet synched to cloud
+        None if photo is not cloud asset
        """
        return self._info["incloud"]

    @property
    def iscloudasset(self):
-        """ Returns True if photo is a cloud asset (in an iCloud library),
-            otherwise False 
+        """Returns True if photo is a cloud asset (in an iCloud library),
+        otherwise False
        """
        if self._db._db_version <= _PHOTOS_4_VERSION:
            return (
@@ -636,9 +634,9 @@ class PhotoInfo:

    @property
    def burst_photos(self):
-        """ If photo is a burst photo, returns list of PhotoInfo objects 
-            that are part of the same burst photo set; otherwise returns empty list.
-            self is not included in the returned list """
+        """If photo is a burst photo, returns list of PhotoInfo objects
+        that are part of the same burst photo set; otherwise returns empty list.
+        self is not included in the returned list"""
        if self._info["burst"]:
            burst_uuid = self._info["burstUUID"]
            return [
@@ -656,9 +654,9 @@ class PhotoInfo:

    @property
    def path_live_photo(self):
-        """ Returns path to the associated video file for a live photo
-            If photo is not a live photo, returns None
-            If photo is missing, returns None """
+        """Returns path to the associated video file for a live photo
+        If photo is not a live photo, returns None
+        If photo is missing, returns None"""

        photopath = None
        if self._db._db_version <= _PHOTOS_4_VERSION:
@@ -785,9 +783,9 @@ class PhotoInfo:

    @property
    def raw_original(self):
-        """ returns True if associated raw image and the raw image is selected in Photos
-            via "Use RAW as Original "
-            otherwise returns False """
+        """returns True if associated raw image and the raw image is selected in Photos
+        via "Use RAW as Original "
+        otherwise returns False"""
        return self._info["raw_is_original"]

    @property
@@ -834,27 +832,27 @@ class PhotoInfo:
        inplace_sep=None,
        filename=False,
        dirname=False,
-        replacement=":",
+        strip=False,
    ):
        """Renders a template string for PhotoInfo instance using PhotoTemplate

        Args:
            template_str: a template string with fields to render
            none_str: a str to use if template field renders to None, default is "_".
-            path_sep: a single character str to use as path separator when joining 
+            path_sep: a single character str to use as path separator when joining
                fields like folder_album; if not provided, defaults to os.path.sep
-            expand_inplace: expand multi-valued substitutions in-place as a single string 
+            expand_inplace: expand multi-valued substitutions in-place as a single string
                instead of returning individual strings
            inplace_sep: optional string to use as separator between multi-valued keywords
                with expand_inplace; default is ','
            filename: if True, template output will be sanitized to produce valid file name
-            dirname: if True, template output will be sanitized to produce valid directory name 
-            replacement: str, value to replace any illegal file path characters with; default = ":"
-        
+            dirname: if True, template output will be sanitized to produce valid directory name
+            strip: if True, strips leading/trailing white space from resulting template
+
        Returns:
            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
        """
-        template = PhotoTemplate(self)
+        template = PhotoTemplate(self, exiftool_path=self._db._exiftool_path)
        return template.render(
            template_str,
            none_str=none_str,
@@ -863,7 +861,7 @@ class PhotoInfo:
            inplace_sep=inplace_sep,
            filename=filename,
            dirname=dirname,
-            replacement=replacement,
+            strip=strip,
        )

    @property
@@ -877,11 +875,11 @@ class PhotoInfo:
        return self._info["latitude"]

    def _get_album_uuids(self):
-        """ Return list of album UUIDs this photo is found in
-        
+        """Return list of album UUIDs this photo is found in
+
            Filters out albums in the trash and any special album types

-        Returns: list of album UUIDs 
+        Returns: list of album UUIDs
        """
        if self._db._db_version <= _PHOTOS_4_VERSION:
            version4 = True
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -70,12 +70,13 @@ class PhotosDB:
    from ._photosdb_process_scoreinfo import _process_scoreinfo
    from ._photosdb_process_comments import _process_comments

-    def __init__(self, dbfile=None, verbose=None):
+    def __init__(self, dbfile=None, verbose=None, exiftool=None):
        """ Create a new PhotosDB object.

        Args:
            dbfile: specify full path to photos library or photos.db; if None, will attempt to locate last library opened by Photos.
            verbose: optional callable function to use for printing verbose text during processing; if None (default), does not print output.
+            exiftool: optional path to exiftool for methods that require this (e.g. PhotoInfo.exiftool); if not provided, will search PATH
        
        Raises:
            FileNotFoundError if dbfile is not a valid Photos library.
@@ -98,6 +99,8 @@ class PhotosDB:
            raise TypeError("verbose must be callable")
        self._verbose = verbose

+        self._exiftool_path = exiftool
+
        # create a temporary directory
        # tempfile.TemporaryDirectory gets cleaned up when the object does
        self._tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
--- a/osxphotos/phototemplate.py
+++ b/osxphotos/phototemplate.py
@@ -6,9 +6,9 @@
 # 2. Needed to handle default values if template not found
 # 3. Didn't want user to need to know python (e.g. by using Mako which is
 #    already used elsewhere in this project)
-# 4. Couldn't figure out how to do #1 and #2 with str.format()
 #
-# This code isn't elegant but it seems to work well.  PRs gladly accepted.
+# This code isn't elegant and is prime for refactoring but it seems to work well.  PRs gladly accepted.
+
 import datetime
 import locale
 import os
@@ -70,18 +70,18 @@ TEMPLATE_SUBSTITUTIONS = {
    + "{created.strftime,%Y-%U} would result in year-week number of year: '2020-23'. "
    + "If used with no template will return null value. "
    + "See https://strftime.org/ for help on strftime templates.",
-    "{modified.date}": "Photo's modification date in ISO format, e.g. '2020-03-22'",
-    "{modified.year}": "4-digit year of photo modification time",
-    "{modified.yy}": "2-digit year of photo modification time",
-    "{modified.mm}": "2-digit month of the photo modification time (zero padded)",
-    "{modified.month}": "Month name in user's locale of the photo modification time",
-    "{modified.mon}": "Month abbreviation in the user's locale of the photo modification time",
-    "{modified.dd}": "2-digit day of the month (zero padded) of the photo modification time",
-    "{modified.dow}": "Day of week in user's locale of the photo modification time",
-    "{modified.doy}": "3-digit day of year (e.g Julian day) of photo modification time, starting from 1 (zero padded)",
-    "{modified.hour}": "2-digit hour of the photo modification time",
-    "{modified.min}": "2-digit minute of the photo modification time",
-    "{modified.sec}": "2-digit second of the photo modification time",
+    "{modified.date}": "Photo's modification date in ISO format, e.g. '2020-03-22'; uses creation date if photo is not modified",
+    "{modified.year}": "4-digit year of photo modification time; uses creation date if photo is not modified",
+    "{modified.yy}": "2-digit year of photo modification time; uses creation date if photo is not modified",
+    "{modified.mm}": "2-digit month of the photo modification time (zero padded); uses creation date if photo is not modified",
+    "{modified.month}": "Month name in user's locale of the photo modification time; uses creation date if photo is not modified",
+    "{modified.mon}": "Month abbreviation in the user's locale of the photo modification time; uses creation date if photo is not modified",
+    "{modified.dd}": "2-digit day of the month (zero padded) of the photo modification time; uses creation date if photo is not modified",
+    "{modified.dow}": "Day of week in user's locale of the photo modification time; uses creation date if photo is not modified",
+    "{modified.doy}": "3-digit day of year (e.g Julian day) of photo modification time, starting from 1 (zero padded); uses creation date if photo is not modified",
+    "{modified.hour}": "2-digit hour of the photo modification time; uses creation date if photo is not modified",
+    "{modified.min}": "2-digit minute of the photo modification time; uses creation date if photo is not modified",
+    "{modified.sec}": "2-digit second of the photo modification time; uses creation date if photo is not modified",
    # "{modified.strftime}": "Apply strftime template to file modification date/time. Should be used in form "
    # + "{modified.strftime,TEMPLATE} where TEMPLATE is a valid strftime template, e.g. "
    # + "{modified.strftime,%Y-%U} would result in year-week number of year: '2020-23'. "
@@ -118,6 +118,10 @@ TEMPLATE_SUBSTITUTIONS = {
    "{place.address.country}": "Country name of the postal address, e.g. 'United States'",
    "{place.address.country_code}": "ISO country code of the postal address, e.g. 'US'",
    "{searchinfo.season}": "Season of the year associated with a photo, e.g. 'Summer'; (Photos 5+ only, applied automatically by Photos' image categorization algorithms).",
+    "{exif.camera_make}": "Camera make from original photo's EXIF inormation as imported by Photos, e.g. 'Apple'",
+    "{exif.camera_model}": "Camera model from original photo's EXIF inormation as imported by Photos, e.g. 'iPhone 6s'",
+    "{exif.lens_model}": "Lens model from original photo's EXIF inormation as imported by Photos, e.g. 'iPhone 6s back camera 4.15mm f/2.2'",
+    "{uuid}": "Photo's internal universally unique identifier (UUID) for the photo, a 36-character string unique to the photo, e.g. '128FB4C6-0B16-4E7D-9108-FB2E90DA1546'",
 }

 # Permitted multi-value substitutions (each of these returns None or 1 or more values)
@@ -145,25 +149,48 @@ MULTI_VALUE_SUBSTITUTIONS = [
    for field in TEMPLATE_SUBSTITUTIONS_MULTI_VALUED
 ]

+# regular expressions for matching template syntax
+RE_OPENING_BRACE = r"(?<!\{)\{"  # match { but not {{
+RE_DELIM = r"([^}]*\+)?"  # group 1: optional DELIM+
+RE_FIELD_NAME = r"([^\\,}+\?]+)"  # group 2: field name
+RE_PATH_SEP = r"(\([^{}\)]*\))?"  # group 3: optional (PATH_SEP)
+# + r"(\[[^{}\)]*\])?"  # group 4: optional [REPLACE]
+RE_REPLACE = r"(\[[^{}]*\])?"  # group 4: optional [REPLACE]
+RE_BOOL_VAL = r"(\?[^\\,}]*)?"  # group 5: optional ?TRUE_VALUE for boolean fields
+RE_DEFAULT_VAL = r"(,[\w\=\;\-\%. ]*)?"  # group 6: optional ,DEFAULT
+RE_CLOSING_BRACE = r"(?=\}(?!\}))\}"  # match } but not }}
+
+MATCH_GROUPS_TOTAL = 6
+MATCH_GROUPS_DELIM = 1
+MATCH_GROUPS_FIELD = 2
+MATCH_GROUPS_PATH_SEP = 3
+MATCH_GROUPS_REPLACE = 4
+MATCH_GROUPS_BOOL_VAL = 5
+MATCH_GROUPS_DEFAULT = 6
+
+# default values for string manipulation template options
+INPLACE_DEFAULT = ","
+PATH_SEP_DEFAULT = os.path.sep
+

 class PhotoTemplate:
    """ PhotoTemplate class to render a template string from a PhotoInfo object """

-    def __init__(self, photo):
-        """ Inits PhotoTemplate class with photo, non_str, and path_sep
+    def __init__(self, photo, exiftool_path=None):
+        """ Inits PhotoTemplate class with photo

        Args:
            photo: a PhotoInfo instance.
+            exiftool_path: optional path to exiftool for use with {exiftool:} template; if not provided, will look for exiftool in $PATH
        """
        self.photo = photo
+        self.exiftool_path = exiftool_path

        # holds value of current date/time for {today.x} fields
        # gets initialized in get_template_value
        self.today = None

-    def make_subst_function(
-        self, none_str, filename, dirname, replacement, get_func=None
-    ):
+    def make_subst_function(self, none_str, filename, dirname, get_func=None):
        """ returns: substitution function for use in re.sub 
            none_str: value to use if substitution lookup is None and no default provided
            get_func: function that gets the substitution value for a given template field
@@ -172,37 +199,39 @@ class PhotoTemplate:
        if get_func is None:
            # used by make_subst_function to get the value for a template substitution
            get_func = partial(
-                self.get_template_value,
-                filename=filename,
-                dirname=dirname,
-                replacement=replacement,
+                self.get_template_value, filename=filename, dirname=dirname
            )

        # closure to capture photo, none_str, filename, dirname in subst
        def subst(matchobj):
            groups = len(matchobj.groups())
-            if groups != 5:
+            if groups != MATCH_GROUPS_TOTAL:
                raise ValueError(
-                    f"Unexpected number of groups: expected 4, got {groups}"
+                    f"Unexpected number of groups: expected {MATCH_GROUPS_TOTAL}, got {groups}"
                )

-            delim = matchobj.group(1)
-            field = matchobj.group(2)
-            path_sep = matchobj.group(3)
-            bool_val = matchobj.group(4)
-            default = matchobj.group(5)
+            delim = matchobj.group(MATCH_GROUPS_DELIM)
+            field = matchobj.group(MATCH_GROUPS_FIELD)
+            path_sep = matchobj.group(MATCH_GROUPS_PATH_SEP)
+            replace = matchobj.group(MATCH_GROUPS_REPLACE)
+            bool_val = matchobj.group(MATCH_GROUPS_BOOL_VAL)
+            default = matchobj.group(MATCH_GROUPS_DEFAULT)

            # drop the '+' on delim
            delim = delim[:-1] if delim is not None else None
            # drop () from path_sep
            path_sep = path_sep.strip("()") if path_sep is not None else None
+            # drop [] from replace
+            replace = replace[1:-1] if replace is not None else None
            # drop the ? on bool_val
            bool_val = bool_val[1:] if bool_val is not None else None
            # drop the comma on default
            default_val = default[1:] if default is not None else None

            try:
-                val = get_func(field, default_val, bool_val, delim, path_sep)
+                val = get_func(
+                    field, default_val, bool_val, delim, path_sep, replacement=replace
+                )
            except ValueError:
                return matchobj.group(0)

@@ -226,7 +255,7 @@ class PhotoTemplate:
        inplace_sep=None,
        filename=False,
        dirname=False,
-        replacement=":",
+        strip=False,
    ):
        """ Render a filename or directory template 

@@ -240,17 +269,17 @@ class PhotoTemplate:
            with expand_inplace; default is ','
            filename: if True, template output will be sanitized to produce valid file name
            dirname: if True, template output will be sanitized to produce valid directory name 
-            replacement: str, value to replace any illegal file path characters with; default = ":"
+            strip: if True, strips leading/trailing whitespace from rendered templates

        Returns:
            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
        """

        if path_sep is None:
-            path_sep = os.path.sep
+            path_sep = PATH_SEP_DEFAULT

        if inplace_sep is None:
-            inplace_sep = ","
+            inplace_sep = INPLACE_DEFAULT

        # the rendering happens in two phases:
        # phase 1: handle all the single-value template substitutions
@@ -263,19 +292,20 @@ class PhotoTemplate:
        # regex to find {template_field,optional_default} in strings
        # pylint: disable=anomalous-backslash-in-string
        regex = (
-            r"(?<!\{)\{"  # match { but not {{
-            + r"([^}]*\+)?"  # group 1: optional DELIM+
-            + r"([^\\,}+\?]+)"  # group 2: field name
-            + r"(\([^{}\)]*\))?"  # group 3: optional (PATH_SEP)
-            + r"(\?[^\\,}]*)?"  # group 4: optional ?TRUE_VALUE for boolean fields
-            + r"(,[\w\=\;\-\%. ]*)?"  # group 5: optional ,DEFAULT
-            + r"(?=\}(?!\}))\}"  # match } but not }}
+            RE_OPENING_BRACE
+            + RE_DELIM
+            + RE_FIELD_NAME
+            + RE_PATH_SEP
+            + RE_REPLACE
+            + RE_BOOL_VAL
+            + RE_DEFAULT_VAL
+            + RE_CLOSING_BRACE
        )

        if type(template) is not str:
            raise TypeError(f"template must be type str, not {type(template)}")

-        subst_func = self.make_subst_function(none_str, filename, dirname, replacement)
+        subst_func = self.make_subst_function(none_str, filename, dirname)

        # do the replacements
        rendered = re.sub(regex, subst_func, template)
@@ -304,14 +334,7 @@ class PhotoTemplate:
        #    '2011/Album2/keyword2/person1',]

        rendered_strings = self._render_multi_valued_templates(
-            rendered,
-            none_str,
-            path_sep,
-            expand_inplace,
-            inplace_sep,
-            filename,
-            dirname,
-            replacement,
+            rendered, none_str, path_sep, expand_inplace, inplace_sep, filename, dirname
        )

        # process exiftool: templates
@@ -323,7 +346,6 @@ class PhotoTemplate:
            inplace_sep,
            filename,
            dirname,
-            replacement,
        )

        # find any {fields} that weren't replaced
@@ -348,6 +370,11 @@ class PhotoTemplate:
                sanitize_filename(rendered_str) for rendered_str in rendered_strings
            ]

+        if strip:
+            rendered_strings = [
+                rendered_str.strip() for rendered_str in rendered_strings
+            ]
+
        return rendered_strings, unmatched

    def _render_multi_valued_templates(
@@ -359,7 +386,6 @@ class PhotoTemplate:
        inplace_sep,
        filename,
        dirname,
-        replacement,
    ):
        rendered_strings = [rendered]
        new_rendered_strings = []
@@ -368,15 +394,16 @@ class PhotoTemplate:
            for field in MULTI_VALUE_SUBSTITUTIONS:
                # Build a regex that matches only the field being processed
                re_str = (
-                    r"(?<!\{)\{"  # match { but not {{
-                    + r"([^}]*\+)?"  # group 1: optional DELIM+
+                    RE_OPENING_BRACE
+                    + RE_DELIM
                    + r"("
                    + field  # group 2: field name
                    + r")"
-                    + r"(\([^{}\)]*\))?"  # group 3: optional (PATH_SEP)
-                    + r"(\?[^\\,}]*)?"  # group 4: optional ?TRUE_VALUE for boolean fields
-                    + r"(,[\w\=\;\-\%. ]*)?"  # group 5: optional ,DEFAULT
-                    + r"(?=\}(?!\}))\}"  # match } but not }}
+                    + RE_PATH_SEP
+                    + RE_REPLACE
+                    + RE_BOOL_VAL
+                    + RE_DEFAULT_VAL
+                    + RE_CLOSING_BRACE
                )
                regex_multi = re.compile(re_str)

@@ -387,21 +414,29 @@ class PhotoTemplate:
                    matches = regex_multi.search(str_template)
                    if matches:
                        path_sep = (
-                            matches.group(3).strip("()")
-                            if matches.group(3) is not None
+                            matches.group(MATCH_GROUPS_PATH_SEP).strip("()")
+                            if matches.group(MATCH_GROUPS_PATH_SEP) is not None
                            else path_sep
                        )
+                        replace = (
+                            matches.group(MATCH_GROUPS_REPLACE)[1:-1]
+                            if matches.group(MATCH_GROUPS_REPLACE) is not None
+                            else None
+                        )
                        values = self.get_template_value_multi(
                            field,
                            path_sep,
                            filename=filename,
                            dirname=dirname,
-                            replacement=replacement,
+                            replacement=replace,
                        )
-                        if expand_inplace or matches.group(1) is not None:
+                        if (
+                            expand_inplace
+                            or matches.group(MATCH_GROUPS_DELIM) is not None
+                        ):
                            delim = (
-                                matches.group(1)[:-1]
-                                if matches.group(1) is not None
+                                matches.group(MATCH_GROUPS_DELIM)[:-1]
+                                if matches.group(MATCH_GROUPS_DELIM) is not None
                                else inplace_sep
                            )
                            # instead of returning multiple strings, join values into a single string
@@ -411,7 +446,9 @@ class PhotoTemplate:
                                else None
                            )

-                            def lookup_template_value_multi(lookup_value, *_):
+                            def lookup_template_value_multi(
+                                lookup_value, *args, **kwargs
+                            ):
                                """ Closure passed to make_subst_function get_func 
                                        Capture val and field in the closure 
                                        Allows make_subst_function to be re-used w/o modification
@@ -427,7 +464,6 @@ class PhotoTemplate:
                                none_str,
                                filename,
                                dirname,
-                                replacement,
                                get_func=lookup_template_value_multi,
                            )
                            new_string = regex_multi.sub(subst, str_template)
@@ -438,7 +474,9 @@ class PhotoTemplate:
                            # create a new template string for each value
                            for val in values:

-                                def lookup_template_value_multi(lookup_value, *_):
+                                def lookup_template_value_multi(
+                                    lookup_value, *args, **kwargs
+                                ):
                                    """ Closure passed to make_subst_function get_func 
                                        Capture val and field in the closure 
                                        Allows make_subst_function to be re-used w/o modification
@@ -454,7 +492,6 @@ class PhotoTemplate:
                                    none_str,
                                    filename,
                                    dirname,
-                                    replacement,
                                    get_func=lookup_template_value_multi,
                                )
                                new_string = regex_multi.sub(subst, str_template)
@@ -473,7 +510,6 @@ class PhotoTemplate:
        inplace_sep,
        filename,
        dirname,
-        replacement,
    ):
        # TODO: lots of code commonality with render_multi_valued_templates -- combine or pull out
        # TODO: put these in globals
@@ -484,15 +520,15 @@ class PhotoTemplate:
            inplace_sep = ","

        # Build a regex that matches only the field being processed
-        # todo: pull out regexes into globals?
        re_str = (
-            r"(?<!\{)\{"  # match { but not {{
-            + r"([^}]*\+)?"  # group 1: optional DELIM+
-            + r"(exiftool:[^\\,}+\?]+)"  # group 3 field name
-            + r"(\([^{}\)]*\))?"  # group 3: optional (PATH_SEP)
-            + r"(\?[^\\,}]*)?"  # group 4: optional ?TRUE_VALUE for boolean fields
-            + r"(,[\w\=\;\-\%. ]*)?"  # group 5: optional ,DEFAULT
-            + r"(?=\}(?!\}))\}"  # match } but not }}
+            RE_OPENING_BRACE
+            + RE_DELIM
+            + r"(exiftool:[^\\,}+\?\[\]]+)"  # group 3 field name
+            + RE_PATH_SEP
+            + RE_REPLACE
+            + RE_BOOL_VAL
+            + RE_DEFAULT_VAL
+            + RE_CLOSING_BRACE
        )
        regex_multi = re.compile(re_str)

@@ -507,17 +543,21 @@ class PhotoTemplate:
                    # allmatches = regex_multi.finditer(str_template)
                    # for matches in allmatches:
                    path_sep = (
-                        matches.group(3).strip("()")
-                        if matches.group(3) is not None
+                        matches.group(MATCH_GROUPS_PATH_SEP).strip("()")
+                        if matches.group(MATCH_GROUPS_PATH_SEP) is not None
                        else path_sep
                    )
-                    field = matches.group(2)
+                    replace = (
+                        matches.group(MATCH_GROUPS_REPLACE)[1:-1]
+                        if matches.group(MATCH_GROUPS_REPLACE) is not None
+                        else None
+                    )
+                    field = matches.group(MATCH_GROUPS_FIELD)
                    subfield = field[9:]
-
                    if not self.photo.path:
                        values = [None]
                    else:
-                        exif = ExifTool(self.photo.path)
+                        exif = ExifTool(self.photo.path, exiftool=self.exiftool_path)
                        exifdict = exif.asdict()
                        exifdict = {k.lower(): v for (k, v) in exifdict.items()}
                        subfield = subfield.lower()
@@ -526,12 +566,24 @@ class PhotoTemplate:
                            values = (
                                [values] if not isinstance(values, list) else values
                            )
+                            if replace and values:
+                                new_values = []
+                                for value in values:
+                                    new_values.append(self.replace(value, replace))
+                                values = new_values
+
+                            # sanitize directory names if needed
+                            if filename:
+                                values = [sanitize_pathpart(value) for value in values]
+                            elif dirname:
+                                values = [sanitize_dirname(value) for value in values]
+
                        else:
                            values = [None]
-                    if expand_inplace or matches.group(1) is not None:
+                    if expand_inplace or matches.group(MATCH_GROUPS_DELIM) is not None:
                        delim = (
-                            matches.group(1)[:-1]
-                            if matches.group(1) is not None
+                            matches.group(MATCH_GROUPS_DELIM)[:-1]
+                            if matches.group(MATCH_GROUPS_DELIM) is not None
                            else inplace_sep
                        )
                        # instead of returning multiple strings, join values into a single string
@@ -539,7 +591,7 @@ class PhotoTemplate:
                            delim.join(sorted(values)) if values and values[0] else None
                        )

-                        def lookup_template_value_exif(lookup_value, *_):
+                        def lookup_template_value_exif(lookup_value, *args, **kwargs):
                            """ Closure passed to make_subst_function get_func 
                                    Capture val and field in the closure 
                                    Allows make_subst_function to be re-used w/o modification
@@ -553,7 +605,6 @@ class PhotoTemplate:
                            none_str,
                            filename,
                            dirname,
-                            replacement,
                            get_func=lookup_template_value_exif,
                        )
                        new_string = regex_multi.sub(subst, str_template)
@@ -563,7 +614,9 @@ class PhotoTemplate:
                        # create a new template string for each value
                        for val in values:

-                            def lookup_template_value_exif(lookup_value, *_):
+                            def lookup_template_value_exif(
+                                lookup_value, *args, **kwargs
+                            ):
                                """ Closure passed to make_subst_function get_func 
                                    Capture val and field in the closure 
                                    Allows make_subst_function to be re-used w/o modification
@@ -579,7 +632,6 @@ class PhotoTemplate:
                                none_str,
                                filename,
                                dirname,
-                                replacement,
                                get_func=lookup_template_value_exif,
                            )
                            new_string = regex_multi.sub(subst, str_template)
@@ -597,7 +649,7 @@ class PhotoTemplate:
        path_sep=None,
        filename=False,
        dirname=False,
-        replacement=":",
+        replacement=None,
    ):
        """lookup value for template field (single-value template substitutions)

@@ -677,73 +729,73 @@ class PhotoTemplate:
            value = (
                DateTimeFormatter(self.photo.date_modified).date
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).date
            )
        elif field == "modified.year":
            value = (
                DateTimeFormatter(self.photo.date_modified).year
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).year
            )
        elif field == "modified.yy":
            value = (
                DateTimeFormatter(self.photo.date_modified).yy
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).yy
            )
        elif field == "modified.mm":
            value = (
                DateTimeFormatter(self.photo.date_modified).mm
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).mm
            )
        elif field == "modified.month":
            value = (
                DateTimeFormatter(self.photo.date_modified).month
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).month
            )
        elif field == "modified.mon":
            value = (
                DateTimeFormatter(self.photo.date_modified).mon
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).mon
            )
        elif field == "modified.dd":
            value = (
                DateTimeFormatter(self.photo.date_modified).dd
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).dd
            )
        elif field == "modified.dow":
            value = (
                DateTimeFormatter(self.photo.date_modified).dow
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).dow
            )
        elif field == "modified.doy":
            value = (
                DateTimeFormatter(self.photo.date_modified).doy
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).doy
            )
        elif field == "modified.hour":
            value = (
                DateTimeFormatter(self.photo.date_modified).hour
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).hour
            )
        elif field == "modified.min":
            value = (
                DateTimeFormatter(self.photo.date_modified).min
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).min
            )
        elif field == "modified.sec":
            value = (
                DateTimeFormatter(self.photo.date_modified).sec
                if self.photo.date_modified
-                else None
+                else DateTimeFormatter(self.photo.date).sec
            )
        elif field == "today.date":
            value = DateTimeFormatter(self.today).date
@@ -849,18 +901,56 @@ class PhotoTemplate:
            )
        elif field == "searchinfo.season":
            value = self.photo.search_info.season if self.photo.search_info else None
+        elif field == "exif.camera_make":
+            value = self.photo.exif_info.camera_make if self.photo.exif_info else None
+        elif field == "exif.camera_model":
+            value = self.photo.exif_info.camera_model if self.photo.exif_info else None
+        elif field == "exif.lens_model":
+            value = self.photo.exif_info.lens_model if self.photo.exif_info else None
+        elif field == "uuid":
+            value = self.photo.uuid
        else:
            # if here, didn't get a match
            raise ValueError(f"Unhandled template value: {field}")

+        if value and replacement:
+            value = self.replace(value, replacement)
+            # process character replacements
+
        if filename:
-            value = sanitize_pathpart(value, replacement=replacement)
+            value = sanitize_pathpart(value)
        elif dirname:
-            value = sanitize_dirname(value, replacement=replacement)
+            value = sanitize_dirname(value)
+
+        return value
+
+    def replace(self, value, replacement):
+        """ process REPLACE template option
+
+        Args:
+            value: str value to process
+            replacement: str in form OLD,NEW|OLD,NEW... with old and new values for replacement
+        
+        Returns:
+            value with all replacements done
+        
+        Raises:
+            ValueError if replacement string is in wrong format
+        """
+        if not value:
+            return value
+
+        replacements = replacement.split("|")
+        for r in replacements:
+            try:
+                old, new = r.split(",")
+            except ValueError:
+                raise ValueError(f"Invalid template REPLACE value: {replacement}")
+            value = value.replace(old, new)
        return value

    def get_template_value_multi(
-        self, field, path_sep, filename=False, dirname=False, replacement=":"
+        self, field, path_sep, filename=False, dirname=False, replacement=None
    ):
        """lookup value for template field (multi-value template substitutions)

@@ -899,12 +989,9 @@ class PhotoTemplate:
                    if dirname:
                        # being used as a filepath so sanitize each part
                        folder = path_sep.join(
-                            sanitize_dirname(f, replacement=replacement)
-                            for f in album.folder_names
-                        )
-                        folder += path_sep + sanitize_dirname(
-                            album.title, replacement=replacement
+                            sanitize_dirname(f) for f in album.folder_names
                        )
+                        folder += path_sep + sanitize_dirname(album.title)
                    else:
                        folder = path_sep.join(album.folder_names)
                        folder += path_sep + album.title
@@ -912,9 +999,7 @@ class PhotoTemplate:
                else:
                    # album not in folder
                    if dirname:
-                        values.append(
-                            sanitize_dirname(album.title, replacement=replacement)
-                        )
+                        values.append(sanitize_dirname(album.title))
                    else:
                        values.append(album.title)
        elif field == "comment":
@@ -932,18 +1017,23 @@ class PhotoTemplate:
                self.photo.search_info.venue_types if self.photo.search_info else []
            )
        elif not field.startswith("exiftool:"):
+            # exiftool: templates handled by _render_exiftool_template
            raise ValueError(f"Unhandled template value: {field}")

+        # do any replacements needs
+        if replacement:
+            new_values = []
+            for value in values:
+                # process replacements
+                new_values.append(self.replace(value, replacement))
+            values = new_values
+
        # sanitize directory names if needed, folder_album handled differently above
        if filename:
-            values = [
-                sanitize_pathpart(value, replacement=replacement) for value in values
-            ]
+            values = [sanitize_pathpart(value) for value in values]
        elif dirname and field != "folder_album":
            # skip folder_album because it would have been handled above
-            values = [
-                sanitize_dirname(value, replacement=replacement) for value in values
-            ]
+            values = [sanitize_dirname(value) for value in values]

        # If no values, insert None so code below will substite none_str for None
        values = values or [None]
--- a/requirements.txt
+++ b/requirements.txt
@@ -42,6 +42,7 @@ mccabe==0.6.1
 modulegraph==0.18
 more-itertools==7.2.0
 multidict==4.7.6
+osxmetadata>=0.99.11
 packaging==19.0
 parso==0.6.2
 pathspec==0.7.0
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 #
 # setup.py script for osxphotos
 #
-# Copyright (c) 2019, 2020 Rhet Turnbull, rturnbull+git@gmail.com
+# Copyright (c) 2019, 2020, 2021 Rhet Turnbull, rturnbull+git@gmail.com
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person
@@ -45,15 +45,15 @@ with open(
    exec(f.read(), about)

 # read README.md into long_description
-with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
+with open(os.path.join(this_directory, "README.rst"), encoding="utf-8") as f:
    about["long_description"] = f.read()

 setup(
    name="osxphotos",
    version=about["__version__"],
-    description="Manipulate (read-only) Apple's Photos app library on Mac OS X",
+    description="Export photos from Apple's macOS Photos app and query the Photos library database to access metadata about images.",
    long_description=about["long_description"],
-    long_description_content_type="text/markdown",
+    long_description_content_type="text/x-rst",
    author="Rhet Turnbull",
    author_email="rturnbull+git@gmail.com",
    url="https://github.com/RhetTbull/",
@@ -81,6 +81,7 @@ setup(
        "wurlitzer>=2.0.1",
        "photoscript>=0.1.0",
        "toml>=0.10.0",
+        "osxmetadata>=0.99.13",
    ],
    entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
    include_package_data=True,
--- a/tests/Test-10.16.0.1.photoslibrary/database/DataModelVersion.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/database/DataModelVersion.plist
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LibrarySchemaVersion</key>
+	<integer>5001</integer>
+	<key>MetaSchemaVersion</key>
+	<integer>3</integer>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.16.0.1.photoslibrary/database/Photos.sqlite.lock
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>hostname</key>
+	<string>Rhets-MacBook-Pro.local</string>
+	<key>hostuuid</key>
+	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
+	<key>pid</key>
+	<integer>400</integer>
+	<key>processname</key>
+	<string>photolibraryd</string>
+	<key>uid</key>
+	<integer>501</integer>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/database/metaSchema.db
+++ b/tests/Test-10.16.0.1.photoslibrary/database/metaSchema.db
--- a/tests/Test-10.16.0.1.photoslibrary/database/photos.db
+++ b/tests/Test-10.16.0.1.photoslibrary/database/photos.db
--- a/tests/Test-10.16.0.1.photoslibrary/database/protection
+++ b/tests/Test-10.16.0.1.photoslibrary/database/protection
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/graphDataProgress.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/graphDataProgress.plist
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/psi.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/psi.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/psi.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/psi.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/searchMetadata.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/searchMetadata.plist
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BlacklistedMeaningsByMeaning</key>
+	<dict/>
+	<key>MePersonUUID</key>
+	<string>39488755-78C0-40B2-B378-EDA280E1823C</string>
+	<key>SceneWhitelist</key>
+	<array>
+		<string>Graduation</string>
+		<string>Aquarium</string>
+		<string>Food</string>
+		<string>Ice Skating</string>
+		<string>Mountain</string>
+		<string>Cliff</string>
+		<string>Basketball</string>
+		<string>Tennis</string>
+		<string>Jewelry</string>
+		<string>Cheese</string>
+		<string>Softball</string>
+		<string>Football</string>
+		<string>Circus</string>
+		<string>Jet Ski</string>
+		<string>Playground</string>
+		<string>Carousel</string>
+		<string>Paint Ball</string>
+		<string>Windsurfing</string>
+		<string>Sailboat</string>
+		<string>Sunbathing</string>
+		<string>Dam</string>
+		<string>Fireplace</string>
+		<string>Flower</string>
+		<string>Scuba</string>
+		<string>Hiking</string>
+		<string>Cetacean</string>
+		<string>Pier</string>
+		<string>Bowling</string>
+		<string>Snowboarding</string>
+		<string>Zoo</string>
+		<string>Snowmobile</string>
+		<string>Theater</string>
+		<string>Boat</string>
+		<string>Casino</string>
+		<string>Car</string>
+		<string>Diving</string>
+		<string>Cycling</string>
+		<string>Musical Instrument</string>
+		<string>Board Game</string>
+		<string>Castle</string>
+		<string>Sunset Sunrise</string>
+		<string>Martial Arts</string>
+		<string>Motocross</string>
+		<string>Submarine</string>
+		<string>Cat</string>
+		<string>Snow</string>
+		<string>Kiteboarding</string>
+		<string>Squash</string>
+		<string>Geyser</string>
+		<string>Music</string>
+		<string>Archery</string>
+		<string>Desert</string>
+		<string>Blackjack</string>
+		<string>Fireworks</string>
+		<string>Sportscar</string>
+		<string>Feline</string>
+		<string>Soccer</string>
+		<string>Museum</string>
+		<string>Baby</string>
+		<string>Fencing</string>
+		<string>Railroad</string>
+		<string>Nascar</string>
+		<string>Sky Surfing</string>
+		<string>Bird</string>
+		<string>Games</string>
+		<string>Baseball</string>
+		<string>Dressage</string>
+		<string>Snorkeling</string>
+		<string>Pyramid</string>
+		<string>Kite</string>
+		<string>Rowboat</string>
+		<string>Golf</string>
+		<string>Watersports</string>
+		<string>Lightning</string>
+		<string>Canyon</string>
+		<string>Auditorium</string>
+		<string>Night Sky</string>
+		<string>Karaoke</string>
+		<string>Skiing</string>
+		<string>Parade</string>
+		<string>Forest</string>
+		<string>Hot Air Balloon</string>
+		<string>Dragon Parade</string>
+		<string>Easter Egg</string>
+		<string>Monument</string>
+		<string>Jungle</string>
+		<string>Thanksgiving</string>
+		<string>Jockey Horse</string>
+		<string>Stadium</string>
+		<string>Airplane</string>
+		<string>Ballet</string>
+		<string>Yoga</string>
+		<string>Coral Reef</string>
+		<string>Skating</string>
+		<string>Wrestling</string>
+		<string>Bicycle</string>
+		<string>Tattoo</string>
+		<string>Amusement Park</string>
+		<string>Canoe</string>
+		<string>Cheerleading</string>
+		<string>Ping Pong</string>
+		<string>Fishing</string>
+		<string>Magic</string>
+		<string>Reptile</string>
+		<string>Winter Sport</string>
+		<string>Waterfall</string>
+		<string>Train</string>
+		<string>Bonsai</string>
+		<string>Surfing</string>
+		<string>Dog</string>
+		<string>Cake</string>
+		<string>Sledding</string>
+		<string>Sandcastle</string>
+		<string>Glacier</string>
+		<string>Lighthouse</string>
+		<string>Equestrian</string>
+		<string>Rafting</string>
+		<string>Shore</string>
+		<string>Hockey</string>
+		<string>Santa Claus</string>
+		<string>Formula One Car</string>
+		<string>Sport</string>
+		<string>Vehicle</string>
+		<string>Boxing</string>
+		<string>Rollerskating</string>
+		<string>Underwater</string>
+		<string>Orchestra</string>
+		<string>Carnival</string>
+		<string>Rocket</string>
+		<string>Skateboarding</string>
+		<string>Helicopter</string>
+		<string>Performance</string>
+		<string>Oktoberfest</string>
+		<string>Water Polo</string>
+		<string>Skate Park</string>
+		<string>Animal</string>
+		<string>Nightclub</string>
+		<string>String Instrument</string>
+		<string>Dinosaur</string>
+		<string>Gymnastics</string>
+		<string>Cricket</string>
+		<string>Volcano</string>
+		<string>Lake</string>
+		<string>Aurora</string>
+		<string>Dancing</string>
+		<string>Concert</string>
+		<string>Rock Climbing</string>
+		<string>Hang Glider</string>
+		<string>Rodeo</string>
+		<string>Fish</string>
+		<string>Art</string>
+		<string>Motorcycle</string>
+		<string>Volleyball</string>
+		<string>Wake Boarding</string>
+		<string>Badminton</string>
+		<string>Motor Sport</string>
+		<string>Sumo</string>
+		<string>Parasailing</string>
+		<string>Skydiving</string>
+		<string>Kickboxing</string>
+		<string>Pinata</string>
+		<string>Foosball</string>
+		<string>Go Kart</string>
+		<string>Poker</string>
+		<string>Kayak</string>
+		<string>Swimming</string>
+		<string>Atv</string>
+		<string>Beach</string>
+		<string>Dartboard</string>
+		<string>Athletics</string>
+		<string>Camping</string>
+		<string>Tornado</string>
+		<string>Billiards</string>
+		<string>Rugby</string>
+		<string>Airshow</string>
+	</array>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/searchProgress.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/searchProgress.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>insertAlbum</key>
+	<array/>
+	<key>insertAsset</key>
+	<array/>
+	<key>insertHighlight</key>
+	<array/>
+	<key>insertMemory</key>
+	<array/>
+	<key>insertMoment</key>
+	<array/>
+	<key>removeAlbum</key>
+	<array/>
+	<key>removeAsset</key>
+	<array/>
+	<key>removeHighlight</key>
+	<array/>
+	<key>removeMemory</key>
+	<array/>
+	<key>removeMoment</key>
+	<array/>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/searchSystemInfo.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/searchSystemInfo.plist
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>embeddingVersion</key>
+	<string>1</string>
+	<key>localeIdentifier</key>
+	<string>en_US</string>
+	<key>sceneTaxonomySHA</key>
+	<string>87914a047c69fbe8013fad2c70fa70c6c03b08b56190fe4054c880e6b9f57cc3</string>
+	<key>searchIndexVersion</key>
+	<string>10</string>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/synonymsProcess.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/synonymsProcess.plist
--- a/tests/Test-10.16.0.1.photoslibrary/database/search/zeroKeywords.data
+++ b/tests/Test-10.16.0.1.photoslibrary/database/search/zeroKeywords.data
--- a/tests/Test-10.16.0.1.photoslibrary/originals/1/1EB2B765-0765-43BA-A90C-0D0580E6172C.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/1/1EB2B765-0765-43BA-A90C-0D0580E6172C.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/3/3DD2C897-F19E-4CA6-8C22-B027D5A71907.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/3/3DD2C897-F19E-4CA6-8C22-B027D5A71907.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96_4.cr2
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96_4.cr2
--- a/tests/Test-10.16.0.1.photoslibrary/originals/6/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/6/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/6/6FD38366-3BF2-407D-81FE-7153EB6125B6.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/6/6FD38366-3BF2-407D-81FE-7153EB6125B6.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/7/71E3E212-00EB-430D-8A63-5E294B268554.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/7/71E3E212-00EB-430D-8A63-5E294B268554.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.heic
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.heic
--- a/tests/Test-10.16.0.1.photoslibrary/originals/8/8846E3E6-8AC8-4857-8448-E3D025784410.tiff
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/8/8846E3E6-8AC8-4857-8448-E3D025784410.tiff
--- a/tests/Test-10.16.0.1.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91_4.cr2
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91_4.cr2
--- a/tests/Test-10.16.0.1.photoslibrary/originals/D/D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068.dng
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/D/D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068.dng
--- a/tests/Test-10.16.0.1.photoslibrary/originals/D/D79B8D77-BFFC-460B-9312-034F2877D35B.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/D/D79B8D77-BFFC-460B-9312-034F2877D35B.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/D/DC99FBDD-7A52-4100-A5BB-344131646C30.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/D/DC99FBDD-7A52-4100-A5BB-344131646C30.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/E/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/E/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/originals/F/F12384F6-CD17-4151-ACBA-AE0E3688539E.jpeg
+++ b/tests/Test-10.16.0.1.photoslibrary/originals/F/F12384F6-CD17-4151-ACBA-AE0E3688539E.jpeg
--- a/tests/Test-10.16.0.1.photoslibrary/private/.metadata_never_index
+++ b/tests/Test-10.16.0.1.photoslibrary/private/.metadata_never_index
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.Photos.Migration/appPrivateData.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.Photos.Migration/appPrivateData.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>MigrationService</key>
+	<dict>
+		<key>State</key>
+		<integer>4</integer>
+	</dict>
+	<key>MigrationService.LastCompletedTask</key>
+	<integer>12</integer>
+	<key>MigrationService.ValidationCounts</key>
+	<dict>
+		<key>MigrationDetectedFaceprint</key>
+		<integer>6</integer>
+		<key>MigrationManagedAsset</key>
+		<integer>0</integer>
+		<key>MigrationSceneClassification</key>
+		<integer>44</integer>
+		<key>MigrationUnmanagedAdjustment</key>
+		<integer>0</integer>
+		<key>RDVersion.cloudLocalState.CPLIsNotPushed</key>
+		<integer>7</integer>
+	</dict>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.Photos/appPrivateData.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.Photos/appPrivateData.plist
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CollapsedSidebarSectionIdentifiers</key>
+	<array/>
+	<key>ExpandedSidebarItemIdentifiers</key>
+	<array>
+		<string>92D68107-B6C7-453B-96D2-97B0F26D5B8B/L0/020</string>
+		<string>88A5F8B8-5B9A-43C7-BB85-3952B81580EB/L0/020</string>
+		<string>29EF7A97-7E76-4D5F-A5E0-CC0A93E8524C/L0/020</string>
+		<string>2C2AF115-BD1D-4434-A747-D1C8BD8E2045/L0/020</string>
+		<string>CB051A4C-2CB7-4B90-B59B-08CC4D0C2823/L0/020</string>
+	</array>
+	<key>IPXWorkspaceControllerZoomLevelsKey</key>
+	<dict>
+		<key>kZoomLevelIdentifierPhotosGrid</key>
+		<integer>2</integer>
+	</dict>
+	<key>Photos</key>
+	<dict>
+		<key>CollapsedSidebarSectionIdentifiers</key>
+		<array/>
+		<key>ExpandedSidebarItemIdentifiers</key>
+		<array>
+			<string>TopLevelAlbums</string>
+			<string>TopLevelSlideshows</string>
+		</array>
+		<key>IPXWorkspaceControllerZoomLevelsKey</key>
+		<dict>
+			<key>kZoomLevelIdentifierAlbums</key>
+			<integer>7</integer>
+			<key>kZoomLevelIdentifierVersions</key>
+			<integer>7</integer>
+		</dict>
+		<key>lastAddToDestination</key>
+		<dict>
+			<key>key</key>
+			<integer>1</integer>
+			<key>lastKnownDisplayName</key>
+			<string>September 28, 2018</string>
+			<key>type</key>
+			<string>album</string>
+			<key>uuid</key>
+			<string>DFFKmHt3Tk+AGzZLe2Xq+g</string>
+		</dict>
+		<key>lastKnownItemCounts</key>
+		<dict>
+			<key>other</key>
+			<integer>0</integer>
+			<key>photos</key>
+			<integer>7</integer>
+			<key>videos</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSearchComputationCache.plist
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSharingFeatureExtractorRecords.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGSharingFeatureExtractorRecords.plist
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BackgroundHighlightCollection</key>
+	<date>2020-06-24T04:02:13Z</date>
+	<key>BackgroundHighlightEnrichment</key>
+	<date>2020-06-24T04:02:12Z</date>
+	<key>BackgroundJobAssetRevGeocode</key>
+	<date>2020-06-24T04:02:13Z</date>
+	<key>BackgroundJobSearch</key>
+	<date>2020-06-24T04:02:13Z</date>
+	<key>BackgroundPeopleSuggestion</key>
+	<date>2020-06-24T04:02:12Z</date>
+	<key>BackgroundUserBehaviorProcessor</key>
+	<date>2020-06-24T04:02:13Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
+	<date>2020-05-30T02:16:06Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
+	<date>2020-05-29T04:31:37Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
+	<date>2020-06-24T04:02:13Z</date>
+	<key>SiriPortraitDonation</key>
+	<date>2020-06-24T04:02:13Z</date>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/construction-photosgraph.kgdb-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/liveupdate-photosgraph.kgdb-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph-tmp.kgdb-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-wal
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-wal
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/ftemetrics
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/ftemetrics
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/revgeoprovider.plist
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/revgeoprovider.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>revgeoprovider</key>
+	<string>7618</string>
+</dict>
+</plist>
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/4E294112-DC9D-4B49-9561-1946B53A4E19.cmap
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/4E294112-DC9D-4B49-9561-1946B53A4E19.cmap
--- a/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/9A5E0437-04AA-45DC-AAA7-FDC74A91F170.cmap
+++ b/tests/Test-10.16.0.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/9A5E0437-04AA-45DC-AAA7-FDC74A91F170.cmap
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rhet Turnbull	c4980fc284	Added README.rst, closes #331	2021-01-08 07:04:07 -08:00
Rhet Turnbull	a7678df397	Updated tests workflow badge link	2021-01-08 06:41:05 -08:00
Rhet Turnbull	e6f45f5949	Merge branch 'master' of github.com:RhetTbull/osxphotos	2021-01-08 06:36:07 -08:00
Rhet Turnbull	f8468c63fd	Renamed workflow to tests	2021-01-08 06:35:56 -08:00
Rhet Turnbull	0545d5e321	Merge pull request #343 from RhetTbull/all-contributors/add-kradalby All contributors/add kradalby	2021-01-08 06:26:51 -08:00
Rhet Turnbull	5de9d4f90c	Merge branch 'master' of github.com:RhetTbull/osxphotos	2021-01-08 06:23:25 -08:00
Rhet Turnbull	123ebb2cb7	Ensure merge_exif_keywords are str not int	2021-01-08 06:23:17 -08:00
Rhet Turnbull	2d09d382e9	skip action for all-contributors bot	2021-01-08 06:22:01 -08:00
allcontributors[bot]	5e676d3507	docs: update .all-contributorsrc [skip ci]	2021-01-08 14:16:30 +00:00
allcontributors[bot]	935865dc65	docs: update README.md [skip ci]	2021-01-08 14:16:25 +00:00
Rhet Turnbull	193f26bec8	Merge pull request #342 from kradalby/master Ensure keyword list only contains strings, @all-contributors please add @kradalby for code	2021-01-08 06:06:17 -08:00
Kristoffer Dalby	7b6a0af314	Ensure keyword list only contains string This commit ensures that every keyword in the keyword list that is to be written to a sidecar or exif only contains strings. The current implementation fails with an exception as the "sorted" functions will fail if the list contains a mix of strings and integers.	2021-01-08 11:33:50 +00:00
Rhet Turnbull	549a9b3572	Updated CHANGELOG.md	2021-01-06 08:33:40 -08:00
Rhet Turnbull	792247b51c	Improved handling of deleted photos, #332	2021-01-06 08:24:58 -08:00
Rhet Turnbull	568d1b36a6	Refactored ExportResults	2021-01-06 06:56:26 -08:00
Rhet Turnbull	d78097ccc0	Added error_str to ExportResults	2021-01-05 21:34:46 -08:00
Rhet Turnbull	ad9dcd9ed7	Updated help text for --export-as-hardlink, #287	2021-01-05 21:10:37 -08:00
Rhet Turnbull	fb5fb8ebc7	Added additional warning to _photoinfo_export	2021-01-04 12:37:12 -08:00
Rhet Turnbull	7deac581b1	Added test for Big Sur 16.0.1 database changes	2021-01-03 19:40:34 -08:00
Rhet Turnbull	1173c00ce7	Updated all-contributors	2021-01-03 15:24:40 -08:00
Rhet Turnbull	2bf83e4b1f	Updated all-contributors	2021-01-03 15:23:21 -08:00
Rhet Turnbull	b93d6822ac	Updated README, version	2021-01-03 10:41:47 -08:00
Rhet Turnbull	90b493b7a4	Merge pull request #327 from synox/patch-1 doc: start with examples before the export reference, thanks to @synox	2021-01-03 10:30:28 -08:00
Rhet Turnbull	2480f2a325	Added tag_groups arg to ExifTool.asdict(), issue #324	2021-01-03 10:28:44 -08:00
Aravindo Wingeier	a59bb5b02f	remove extra spaces	2021-01-03 19:09:29 +01:00
Aravindo Wingeier	7c8bfc811a	Adding back dependency https://github.com/RhetTbull/PhotoScript )	2021-01-03 19:08:32 +01:00
Aravindo Wingeier	7c7bf1be6b	doc: start with examples before the export reference Because the very long export reference might makes it hard to spot the examples.	2021-01-03 19:04:49 +01:00
Rhet Turnbull	b1cab32ff4	Updated dependencies in README.md	2021-01-03 09:48:01 -08:00
Rhet Turnbull	05f111a287	Added exception handling/capture for convert-to-jpeg, issue #322	2021-01-03 09:36:26 -08:00
Rhet Turnbull	83915c65ab	Add @synox as a contributor	2021-01-03 09:24:45 -08:00
Rhet Turnbull	22f44f7f40	Merge pull request #326 from synox/master Make readme easier for beginners, thanks to @synox	2021-01-03 09:21:20 -08:00
Aravindo Wingeier	02ef0f9a25	doc simplify readme	2021-01-03 18:04:51 +01:00
Rhet Turnbull	6347d94dfb	Updated CHANGELOG.md	2021-01-03 08:47:16 -08:00
Rhet Turnbull	a32c102d62	Updated CHANGELOG.md	2021-01-03 08:46:36 -08:00
Aravindo Wingeier	38842ff924	Cleanup up the readme simplify as much as possible	2021-01-03 17:31:42 +01:00
Rhet Turnbull	478715a363	Implemented text replacement for templates, issue #316	2021-01-03 07:38:07 -08:00
Rhet Turnbull	74f1002b9a	Updated CHANGELOG.md	2020-12-31 13:11:21 -08:00
Rhet Turnbull	2f57abd23c	Fixed modified template to use creation time if no modificationd date, issue #312	2020-12-31 13:07:00 -08:00
Rhet Turnbull	f9a43b92c1	Updated CHANGELOG.md	2020-12-31 12:36:16 -08:00
Rhet Turnbull	bf2a55d7f6	Added --xattr-template, closes #242	2020-12-31 12:33:15 -08:00
Rhet Turnbull	34bb7f2cdc	Updated CHANGELOG.md	2020-12-30 20:48:38 -08:00
Rhet Turnbull	3394c52768	Fixed --exiftool-path bug, issue #311 , #313	2020-12-30 20:21:05 -08:00
Rhet Turnbull	27282af3b9	Updated CHANGELOG.md	2020-12-30 14:00:31 -08:00
Rhet Turnbull	b7b06b9fdb	Merge pull request #310 from RhetTbull/finder_tags Added Finder tags, partial implementation for issue #242	2020-12-30 13:52:37 -08:00
Rhet Turnbull	29e424575a	Added tests for Finder tags	2020-12-30 13:37:15 -08:00
Rhet Turnbull	ea373c4197	Updated requirements.txt	2020-12-30 08:52:58 -08:00
Rhet Turnbull	f25a299309	Updated README for finder tags	2020-12-30 08:51:01 -08:00
Rhet Turnbull	5885b23d32	Initial implementation for Finder tags	2020-12-30 08:32:42 -08:00
Rhet Turnbull	5dccdf7750	Fixed --exiftool-path bug, issue #308	2020-12-30 07:31:07 -08:00
Rhet Turnbull	e9134f84df	Updated CHANGELOG.md	2020-12-29 09:51:18 -08:00
Rhet Turnbull	3872e7ae64	Fixed --exiftool-path to work with --exiftool-merge-keywords/persons	2020-12-29 09:47:03 -08:00
Rhet Turnbull	b3e86dffc8	Updated CHANGELOG.md	2020-12-29 09:46:25 -08:00
Rhet Turnbull	4897fc4b05	Added --exiftool-path to CLI	2020-12-29 09:23:51 -08:00
Rhet Turnbull	1dbf22fdc9	Updated CHANGELOG.md	2020-12-29 08:03:21 -08:00
Rhet Turnbull	fa58af8b88	Added exiftool signature to JSON output, issue #303	2020-12-29 07:51:34 -08:00
Rhet Turnbull	9c9bcb08b3	Updated CHANGELOG.md	2020-12-28 15:42:09 -08:00