Implemented PhotoInfo.exiftool

Updated CHANGELOG.md
Added ExifInfo (Photos 5 only)
2020-05-14 12:55:17 -07:00 · 2020-05-14 06:46:12 -07:00 · 2020-05-13 22:42:33 -07:00 · 2020-05-11 05:07:19 -07:00 · 2020-05-10 22:05:21 -05:00 · 2020-05-10 19:55:54 -07:00
200 changed files with 4404 additions and 1485 deletions
--- a/.github/workflows/pythonpackage.yml
+++ b/.github/workflows/pythonpackage.yml
@@ -9,7 +9,7 @@ jobs:
    strategy:
      max-parallel: 4
      matrix:
-        python-version: [3.6, 3.7, 3.8]
+        python-version: [3.8]

    steps:
    - uses: actions/checkout@v1
@@ -21,8 +21,8 @@ jobs:
      run: |
        python -m pip install --upgrade pip
        pip install -r requirements.txt
-    - name: Lint with flake8
-      run: |
+   # - name: Lint with flake8
+   #   run: |
       # pip install flake8
        # stop the build if there are Python syntax errors or undefined names
       # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
@@ -31,4 +31,5 @@ jobs:
    - name: Test with pytest
      run: |
        pip install pytest
+        pip install pytest-mock
        python -m pytest tests/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,115 @@ 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.28.17](https://github.com/RhetTbull/osxphotos/compare/v0.28.15...v0.28.17)
+
+> 14 May 2020
+
+- Added ExifInfo (Photos 5 only) [`53304d7`](https://github.com/RhetTbull/osxphotos/commit/53304d702317d007056c1d12064503c3ec4ae6f6)
+- Added as_dict to ExifTool [`d1af14d`](https://github.com/RhetTbull/osxphotos/commit/d1af14dbb4d441a62d352123774e51fa3538db97)
+
+#### [v0.28.15](https://github.com/RhetTbull/osxphotos/compare/v0.28.13...v0.28.15)
+
+> 11 May 2020
+
+- fixed some minor findings... [`#127`](https://github.com/RhetTbull/osxphotos/pull/127)
+- added --export-as-hardlink option [`#126`](https://github.com/RhetTbull/osxphotos/pull/126)
+- Added test for folder_names on 10.15.4, closes #119 [`#119`](https://github.com/RhetTbull/osxphotos/issues/119)
+- Refactored photosdb and photoinfo to add SearchInfo and labels [`98b3f63`](https://github.com/RhetTbull/osxphotos/commit/98b3f63a92aa2105f8fa97af992fc6fe2d78b973)
+- Added additional test for --export-as-hardlink [`57315d4`](https://github.com/RhetTbull/osxphotos/commit/57315d44497fde977956f76f667470208f11aa2d)
+- added CHANGELOG.md [`00e1661`](https://github.com/RhetTbull/osxphotos/commit/00e16611fc86c05fb090d036084db9eb42444071)
+
+#### [v0.28.13](https://github.com/RhetTbull/osxphotos/compare/v0.28.10...v0.28.13)
+
+> 2 May 2020
+
+- added --keyword-template [`65674f5`](https://github.com/RhetTbull/osxphotos/commit/65674f57bc174c078e6c47f12ba3aaba87bfa3a4)
+- Fixed bug related to issue #119 [`7af1ccd`](https://github.com/RhetTbull/osxphotos/commit/7af1ccd4ed22ea7f0f86973bfba7f108b6650291)
+- test library updates [`1b6f661`](https://github.com/RhetTbull/osxphotos/commit/1b6f661e6b59c003d3b8cb35226ffb51469be508)
+
+#### [v0.28.10](https://github.com/RhetTbull/osxphotos/compare/v0.28.8...v0.28.10)
+
+> 29 April 2020
+
+- Bug fix for albums in Photos &lt;= 4 to address issue #116 [`a57da23`](https://github.com/RhetTbull/osxphotos/commit/a57da2346b282d731ed41db600bfc5cbeb1a0992)
+- version bump for pypi [`3fe03cd`](https://github.com/RhetTbull/osxphotos/commit/3fe03cd12752c2a7769007b6d934f1efe9f9c4d2)
+
+#### [v0.28.8](https://github.com/RhetTbull/osxphotos/compare/v0.28.7...v0.28.8)
+
+> 28 April 2020
+
+- Fixed implementation of use_albums_as_keywords and use_persons_as_keywords, closes #115 [`#115`](https://github.com/RhetTbull/osxphotos/issues/115)
+- Updated CHANGELOG.md [`072a8d7`](https://github.com/RhetTbull/osxphotos/commit/072a8d795e5e15fa8ca8d8872aecf4cddd7837f7)
+- Update README.md [`5cc98c3`](https://github.com/RhetTbull/osxphotos/commit/5cc98c338bcc19fd05bf293eb3afe24c07c8b380)
+- Updated README.md [`a800711`](https://github.com/RhetTbull/osxphotos/commit/a80071111f810a1d7d6e2d735839e85499091ea4)
+
+#### [v0.28.7](https://github.com/RhetTbull/osxphotos/compare/v0.28.6...v0.28.7)
+
+> 28 April 2020
+
+- Added --album-keyword and --person-keyword to CLI, closes #61 [`#61`](https://github.com/RhetTbull/osxphotos/issues/61)
+- Updated test libraries [`54d5d4b`](https://github.com/RhetTbull/osxphotos/commit/54d5d4b7ba99204f58e723231309ab6e306be28c)
+- Updated CHANGELOG.md [`38137a1`](https://github.com/RhetTbull/osxphotos/commit/38137a1351cdb7ab72393ea03828933dac0b76b0)
+- Updated tests/README.md [`56a0006`](https://github.com/RhetTbull/osxphotos/commit/56a000609f2f08d0f8800fec49cada2980c3bb9d)
+
+#### [v0.28.6](https://github.com/RhetTbull/osxphotos/compare/v0.28.5...v0.28.6)
+
+> 26 April 2020
+
+- Fixed locale bug in templates, closes #113 [`#113`](https://github.com/RhetTbull/osxphotos/issues/113)
+- Updated CHANGELOG.md [`81d4e39`](https://github.com/RhetTbull/osxphotos/commit/81d4e392c39f0fe6f967a447c7d0c970bf224032)
+- Updated test to avoid issue with GitHub workflow [`9be0f84`](https://github.com/RhetTbull/osxphotos/commit/9be0f849b73061d053d30274ff3295b79c88f0b6)
+- Update pythonpackage.yml to remove older pythons [`ccb5f25`](https://github.com/RhetTbull/osxphotos/commit/ccb5f252d14e9335ae04a2e338a6d527b80c9a93)
+
+#### [v0.28.5](https://github.com/RhetTbull/osxphotos/compare/0.28.2...v0.28.5)
+
+> 21 April 2020
+
+- added __len__ to PhotosDB, closes #44 [`#44`](https://github.com/RhetTbull/osxphotos/issues/44)
+- Updated use of _PHOTOS_4_VERSION, closes #106 [`#106`](https://github.com/RhetTbull/osxphotos/issues/106)
+- Updated tests and test library with RAW images [`9b9b54e`](https://github.com/RhetTbull/osxphotos/commit/9b9b54e590e43ae49fb3ae41d493a1f8faec4181)
+- Updated setup.py to resolve issue with bpylist2 on python &lt; 3.8 [`8e4b88a`](https://github.com/RhetTbull/osxphotos/commit/8e4b88ad1fc18438f941e045bfc8aeac878914f9)
+- Added cli.py for use with pyinstaller [`cf28cb6`](https://github.com/RhetTbull/osxphotos/commit/cf28cb6452de17f2ef8d80435386e8d5a1aabd34)
+
+#### [0.28.2](https://github.com/RhetTbull/osxphotos/compare/v0.28.1...0.28.2)
+
+> 18 April 2020
+
+- Added folder support for Photos &lt;= 4, closes #93 [`#93`](https://github.com/RhetTbull/osxphotos/issues/93)
+- cleaned up SQL statements in _process_database4 [`6f28171`](https://github.com/RhetTbull/osxphotos/commit/6f281711e2001a63ffad076d7b9835272d5d09da)
+- Updated CHANGELOG.md [`1fa9583`](https://github.com/RhetTbull/osxphotos/commit/1fa9583ea689d54d2613a064f1ade25bcdfbf043)
+- Fixed suffix check on export to be case insensitive [`4b30b3b`](https://github.com/RhetTbull/osxphotos/commit/4b30b3b4260e2c7409e18825e5b626efe646db16)
+
+#### [v0.28.1](https://github.com/RhetTbull/osxphotos/compare/v0.27.4...v0.28.1)
+
+> 18 April 2020
+
+- Initial work on suppport for associated RAW images [`7e42ebb`](https://github.com/RhetTbull/osxphotos/commit/7e42ebb2402d45cd5d20bdd55bddddaa9db4679f)
+- Initial support for RAW photos in Photos 4 to address issue #101 [`9d15147`](https://github.com/RhetTbull/osxphotos/commit/9d151478d610291b8d482aafae3d445dfd391fca)
+- replaced CLI option --original-name with --current-name [`36c2821`](https://github.com/RhetTbull/osxphotos/commit/36c2821a0fa62eaaa54cf1edc2d9c6da98155354)
+
+#### [v0.27.4](https://github.com/RhetTbull/osxphotos/compare/v0.27.3...v0.27.4)
+
+> 12 April 2020
+
+- Added {folder_album} to template and --folder to CLI [`b7c7b9f`](https://github.com/RhetTbull/osxphotos/commit/b7c7b9f0664e69c743bdd8a228ad2936cf6b7600)
+- Test library update [`21e7020`](https://github.com/RhetTbull/osxphotos/commit/21e7020fec406b0f3926d7adc8a1451bfe77e75a)
+- Updated CHANGELOG.md [`952741d`](https://github.com/RhetTbull/osxphotos/commit/952741d488d2fbbaf8a0c1d3781ad7c4205c068f)
+
+#### [v0.27.3](https://github.com/RhetTbull/osxphotos/compare/v0.27.1...v0.27.3)
+
+> 12 April 2020
+
+- Added additional tests for album_info [`97362fc`](https://github.com/RhetTbull/osxphotos/commit/97362fc0f13b2867abc013f4ba97ae60b0700894)
+- Fixed bug with handling of deleted albums [`9fef12e`](https://github.com/RhetTbull/osxphotos/commit/9fef12ed37634a7bdb11232976b4b2ddccd1a7cb)
+
+#### [v0.27.1](https://github.com/RhetTbull/osxphotos/compare/v0.27.0...v0.27.1)
+
+> 12 April 2020
+
+- Changed AlbumInfo and FolderInfo interface to maintain backwards compatibility with PhotosDB.albums [`e09f0b4`](https://github.com/RhetTbull/osxphotos/commit/e09f0b40f1671d70ee399cdc519492b04fac8adc)
+- Updated CHANGELOG.md [`b749681`](https://github.com/RhetTbull/osxphotos/commit/b749681c6d2545eacf653ab1b2a5d1384e3123eb)
+
 #### [v0.27.0](https://github.com/RhetTbull/osxphotos/compare/v0.26.1...v0.27.0)

 > 11 April 2020
@@ -12,7 +121,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Added tests and README for AlbumInfo and FolderInfo [`d6a22b7`](https://github.com/RhetTbull/osxphotos/commit/d6a22b765ab17f6ef1ba8c50b77946f090979968)
 - Added albuminfo.py for AlbumInfo and FolderInfo classes [`9636572`](https://github.com/RhetTbull/osxphotos/commit/96365728c2ff42abfb6828872ffac53b4c3c8024)
 - Updated CHANGELOG.md [`cde56e9`](https://github.com/RhetTbull/osxphotos/commit/cde56e9d13baf3098ec85839cf1aaa33b4915ac9)
- Update README.md TOC [`8544667`](https://github.com/RhetTbull/osxphotos/commit/8544667c729ea0d7fe39671d909e09cda519e250)

 #### [v0.26.1](https://github.com/RhetTbull/osxphotos/compare/v0.26.0...v0.26.1)

@@ -46,8 +154,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Updated render_filepath_template to support multiple values [`6a89888`](https://github.com/RhetTbull/osxphotos/commit/6a898886ddadc9d5bc9dbad6ee7365270dd0a26d)
 - Added {album}, {keyword}, and {person} to template system [`507c4a3`](https://github.com/RhetTbull/osxphotos/commit/507c4a374014f999ca19789bce0df0c14332e021)
 - Added places command to CLI [`fd5e748`](https://github.com/RhetTbull/osxphotos/commit/fd5e748dca759ea1c3a7329d447f363afe8418b7)
- Updated export example [`01cd7fe`](https://github.com/RhetTbull/osxphotos/commit/01cd7fed6d7fc0c61c171a05319c211eb0a9f7c1)
- Updated CHANGELOG.md [`daea30f`](https://github.com/RhetTbull/osxphotos/commit/daea30f1626a208209ab6854cbd3b12f4b0a3405)

 #### [v0.24.2](https://github.com/RhetTbull/osxphotos/compare/v0.24.1...v0.24.2)

@@ -126,8 +232,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Added query/export options for special media types [`2b7d84a`](https://github.com/RhetTbull/osxphotos/commit/2b7d84a4d103982ad874d875bafbc34d654d539a)
 - README.md update [`a27ce33`](https://github.com/RhetTbull/osxphotos/commit/a27ce33473df3260dfb7ed26e28295cbf87d1e78)
 - Test library updates [`2d7d0b8`](https://github.com/RhetTbull/osxphotos/commit/2d7d0b86e0008cae043e314937504f36ad882990)
- Fixed bug in --download-missing related to burst images [`1f13ba8`](https://github.com/RhetTbull/osxphotos/commit/1f13ba837fe36ff4eeb48cca02f5312a88a0a765)
- test library update [`acb6b9e`](https://github.com/RhetTbull/osxphotos/commit/acb6b9e72f7f6b8f4f1d64b46f270a4d3e984fef)

 #### [v0.22.13](https://github.com/RhetTbull/osxphotos/compare/v0.22.12...v0.22.13)

@@ -162,8 +266,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Slight refactor to PhotosDB.photos() [`91d5729`](https://github.com/RhetTbull/osxphotos/commit/91d5729beaa0f0c2583e6320b18d958429e66075)
 - Test library updates [`6e563e2`](https://github.com/RhetTbull/osxphotos/commit/6e563e214c569ba7838f7464de9258c3bba5db23)
 - Removed _tmp_file code that's no longer needed [`27994c9`](https://github.com/RhetTbull/osxphotos/commit/27994c9fd372303833a5794f1de9815f425c762e)
- Updated photos_repl.py [`fdf636a`](https://github.com/RhetTbull/osxphotos/commit/fdf636ac8864ebb2cc324b1f9d3c6c82ee3910f9)
- Updated CHANGELOG.md [`f910124`](https://github.com/RhetTbull/osxphotos/commit/f910124fe1fbf75d44c09c79607374bf000733a1)

 #### [v0.22.7](https://github.com/RhetTbull/osxphotos/compare/v0.22.4...v0.22.7)

@@ -176,8 +278,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Added XMP sidecar to export [`4dfb131`](https://github.com/RhetTbull/osxphotos/commit/4dfb131a21b1b1efefe3b918ecb06fc6fcb03f2c)
 - Added date_modified to PhotoInfo [`67b0ae0`](https://github.com/RhetTbull/osxphotos/commit/67b0ae0bf679815372d415c3064e21d46a5b8718)
 - Added date_modified to PhotoInfo [`4d36b3b`](https://github.com/RhetTbull/osxphotos/commit/4d36b3b31f3e0e74d9d111b6b691771e19f94086)
- Updated CLI options with more descriptive metavar names [`e79cb92`](https://github.com/RhetTbull/osxphotos/commit/e79cb92693758c984dc789d5fa5d2e87e381e921)
- CLI now looks for photos library to use if non specified by user [`50b7e69`](https://github.com/RhetTbull/osxphotos/commit/50b7e6920a694aa45f478d1131868525c9147919)

 #### [v0.22.4](https://github.com/RhetTbull/osxphotos/compare/v0.22.0...v0.22.4)

@@ -188,8 +288,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refactor cli: singular --db, --json and query options. [`e214746`](https://github.com/RhetTbull/osxphotos/commit/e214746063271e6f9f586286103ed051ada49d85)
 - Implement from_date and to_date in PhotosDB as well as query and export command. Some refactoring of CLI as well. [`cfa2b4a`](https://github.com/RhetTbull/osxphotos/commit/cfa2b4a828facf0aff5bc19f777457ad776c4a05)
 - Refactored _query.  Still hairy, but less so. [`b9dee49`](https://github.com/RhetTbull/osxphotos/commit/b9dee4995c6d89fadb3d2482374b7098f2ab5ed9)
- Updated README.md [`0aff83f`](https://github.com/RhetTbull/osxphotos/commit/0aff83ff21c20e293c0b75bacf2863090a0fb725)
- Started adding tests for CLI [`f0b18c3`](https://github.com/RhetTbull/osxphotos/commit/f0b18c3d29b2141d348be0495013c51c072c6251)

 #### [v0.22.0](https://github.com/RhetTbull/osxphotos/compare/v0.21.5...v0.22.0)

@@ -240,10 +338,12 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - removed old applescript code and files [`1839593`](https://github.com/RhetTbull/osxphotos/commit/18395933a583314d5d992492713752003852e75c)
 - Added test cases and documentation for shared photos and shared albums [`6d20e9e`](https://github.com/RhetTbull/osxphotos/commit/6d20e9e36185aa027d82237cadfe3b55614ba96f)
 - Refactored PhotoInfo to use properties instead of methods--major update [`1ddd90c`](https://github.com/RhetTbull/osxphotos/commit/1ddd90cbdc824afc5df9d2347e730bd9f86350ee)
- Moved PhotosDB attributes to properties instead of methods [`d95acdf`](https://github.com/RhetTbull/osxphotos/commit/d95acdf9f8764a1720bcba71a6dad29bf668eaf9)
- changed interface for export, prepped for exiftool_json_sidecar [`1fe8859`](https://github.com/RhetTbull/osxphotos/commit/1fe885962e8a9a420e776bdd3dc640ca143224b2)

-#### [v0.15.1](https://github.com/RhetTbull/osxphotos/compare/v0.14.21...v0.15.1)
+#### [v0.15.1](https://github.com/RhetTbull/osxphotos/compare/v0.15.0...v0.15.1)
+
+> 14 May 2020
+
+#### [v0.15.0](https://github.com/RhetTbull/osxphotos/compare/v0.14.21...v0.15.0)

 > 14 December 2019

@@ -261,8 +361,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Added get_db_path and get_library_path to PhotosDB [`1d006a4`](https://github.com/RhetTbull/osxphotos/commit/1d006a4b50ed58b01c6116734bef5f740655a063)
 - Updated PhotosDB.__init__() to accept positional or named arg for dbfile and added associated tests [`9118043`](https://github.com/RhetTbull/osxphotos/commit/911804317b98bf485a39b8588c772be14314aa51)
 - Updated album code in process_database4 and process_database5 to use album uuid [`1cf3e4b`](https://github.com/RhetTbull/osxphotos/commit/1cf3e4b9540c15f8bda2545deb183912bcda40a7)
- Updated get_db_version and associated tests [`eb563ad`](https://github.com/RhetTbull/osxphotos/commit/eb563ad29738f29f3514ebfb4747baa2dc5356be)
- Added external_edit for Photos 5 [`42baa29`](https://github.com/RhetTbull/osxphotos/commit/42baa29c18fe2ff16e4d684f87ef7a85993898c1)

 #### [v0.14.8](https://github.com/RhetTbull/osxphotos/compare/v0.14.6...v0.14.8)

--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 [![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)

 - [OSXPhotos](#osxphotos)
  * [What is osxphotos?](#what-is-osxphotos)
@@ -13,14 +13,16 @@
  * [Package Interface](#package-interface)
    + [PhotosDB](#photosdb)
    + [PhotoInfo](#photoinfo)
+    + [ExifInfo](#exifinfo)
    + [AlbumInfo](#albuminfo)
    + [FolderInfo](#folderinfo)
    + [PlaceInfo](#placeinfo)
-    + [Template Functions](#template-functions)
+    + [Template Substitutions](#template-substitutions)
    + [Utility Functions](#utility-functions)
  * [Examples](#examples)
  * [Related Projects](#related-projects)
  * [Contributing](#contributing)
+  * [Known Bugs](#known-bugs)
  * [Implementation Notes](#implementation-notes)
  * [Dependencies](#dependencies)
  * [Acknowledgements](#acknowledgements)
@@ -32,17 +34,27 @@ OSXPhotos provides the ability to interact with and query Apple's Photos.app lib

 ## Supported operating systems

-Only works on MacOS (aka Mac OS X). Tested on MacOS 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 / Photos 5.0. Requires python >= 3.6
+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.4 / Photos 5.0. 

-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 4.0 on MacOS 10.14 on a machine running MacOS 10.12
+Requires python >= 3.6 though if you use `pip` to install, you must use python >= 3.8.  See notes [below](#Installation-instructions). I highly recommend running this with python >= 3.8 as I'll eventually drop support for 3.6 and 3.7.
+
+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 4.0 on MacOS 10.14 on a machine running MacOS 10.12.


 ## Installation instructions

-osxmetadata uses setuptools, thus simply run:
+OSXPhotos uses setuptools, thus simply run:

 	python3 setup.py install

+If you're using python 3.6 or 3.7, you'll need to do this first to get around an issue with bpylist2:
+
+	pip install -r requirements.txt
+
+You can also install directly from [pypi](https://pypi.org/) but you must use python >= 3.8 to avoid an error with bpylist2.  The package currently works fine with python 3.6 or 3.7 but I know of no way to get `pip` to install the right dependencies. 
+
+    pip install osxphotos
+	
 ## 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`
@@ -95,7 +107,10 @@ Usage: osxphotos export [OPTIONS] [PHOTOS_LIBRARY]... DEST
  Optionally, query the Photos database using 1 or more search options;  if
  more than one option is provided, they are treated as "AND"  (e.g. search
  for photos matching all options). If no query options are provided, all
-  photos will be exported.
+  photos will be exported. By default, all versions of all photos will be
+  exported including edited versions, live photo movies, burst photos, and
+  associated RAW images.  See --skip-edited, --skip-live, --skip-bursts, and
+  --skip-raw options to modify this behavior.

 Options:
  --db <Photos database path>     Specify Photos database path. Path to Photos
@@ -107,16 +122,22 @@ Options:
                                  order: 1. last opened library, 2. system
                                  library, 3. ~/Pictures/Photos
                                  Library.photoslibrary
-  --keyword KEYWORD               Search for keyword KEYWORD. If more than one
-                                  keyword, treated as "OR", e.g. find photos
-                                  match any keyword
-  --person PERSON                 Search for person PERSON. If more than one
-                                  person, treated as "OR", e.g. find photos
-                                  match any person
-  --album ALBUM                   Search for album ALBUM. If more than one
-                                  album, treated as "OR", e.g. find photos
-                                  match any album
-  --uuid UUID                     Search for UUID(s).
+  -V, --verbose                   Print verbose output.
+  --keyword KEYWORD               Search for photos with keyword KEYWORD. If
+                                  more than one keyword, treated as "OR", e.g.
+                                  find photos match any keyword
+  --person PERSON                 Search for photos with person PERSON. If
+                                  more than one person, treated as "OR", e.g.
+                                  find photos match any person
+  --album ALBUM                   Search for photos in album ALBUM. If more
+                                  than one album, treated as "OR", e.g. find
+                                  photos match any album
+  --folder FOLDER                 Search for photos in an album in folder
+                                  FOLDER. If more than one folder, treated as
+                                  "OR", e.g. find photos in any FOLDER.  Only
+                                  searches top level folders (e.g. does not
+                                  look at subfolders)
+  --uuid UUID                     Search for photos with UUID(s).
  --title TITLE                   Search for TITLE in title of photo.
  --no-title                      Search for photos with no title.
  --description DESC              Search for DESC in description of photo.
@@ -166,6 +187,8 @@ Options:
  --not-selfie                    Search for photos that are not selfies.
  --panorama                      Search for panorama photos.
  --not-panorama                  Search for photos that are not panoramas.
+  --has-raw                       Search for photos with both a jpeg and RAW
+                                  version
  --only-movies                   Search only for movies (default searches
                                  both images and movies).
  --only-photos                   Search only for photos/images (default
@@ -178,7 +201,7 @@ Options:
                                  Search by end item date, e.g.
                                  2000-01-12T12:00:00 or 2000-12-31 (ISO 8601
                                  w/o TZ).
-  -V, --verbose                   Print verbose output.
+  --export-as-hardlink            Hardlink files instead of copying them.
  --overwrite                     Overwrite existing files. Default behavior
                                  is to add (1), (2), etc to filename if file
                                  already exists. Use this with caution as it
@@ -187,19 +210,39 @@ Options:
  --export-by-date                Automatically create output folders to
                                  organize photos by date created (e.g.
                                  DEST/2019/12/20/photoname.jpg).
-  --export-edited                 Also export edited version of photo if an
-                                  edited version exists.  Edited photo will be
-                                  named in form of "photoname_edited.ext"
-  --export-bursts                 If a photo is a burst photo export all
-                                  associated burst images in the library.  Not
-                                  currently compatible with --download-
-                                  misssing; see note on --download-missing.
-  --export-live                   If a photo is a live photo export the
-                                  associated live video component.  Live video
-                                  will have same name as photo but with .mov
-                                  extension.
-  --original-name                 Use photo's original filename instead of
-                                  current filename for export.
+  --skip-edited                   Do not export edited version of photo if an
+                                  edited version exists.
+  --skip-bursts                   Do not export all associated burst images in
+                                  the library if a photo is a burst photo.
+  --skip-live                     Do not export the associated live video
+                                  component of a live photo.
+  --skip-raw                      Do not export associated RAW images of a
+                                  RAW/jpeg pair.  Note: this does not skip RAW
+                                  photos if the RAW photo does not have an
+                                  associated jpeg image (e.g. the RAW file was
+                                  imported to Photos without a jpeg preview).
+  --person-keyword                Use person in image as keyword/tag when
+                                  exporting metadata.
+  --album-keyword                 Use album name as keyword/tag when exporting
+                                  metadata.
+  --keyword-template TEMPLATE     For use with --exiftool, --sidecar; specify
+                                  a template string to use as keyword in the
+                                  form '{name,DEFAULT}' This is the same
+                                  format as --directory.  For example, if you
+                                  wanted to add the full path to the folder
+                                  and album photo is contained in as a keyword
+                                  when exporting you could specify --keyword-
+                                  template "{folder_album}" You may specify
+                                  more than one template, for example
+                                  --keyword-template "{folder_album}"
+                                  --keyword-template "{created.year}" See
+                                  Templating System below.
+  --current-name                  Use photo's current filename instead of
+                                  original filename for export.  Note:
+                                  Starting with Photos 5, all photos are
+                                  renamed upon import.  By default, photos are
+                                  exported with the the original name they had
+                                  before import.
  --sidecar FORMAT                Create sidecar for each photo exported;
                                  valid FORMAT values: xmp, json; --sidecar
                                  json: create JSON sidecar useable by
@@ -219,9 +262,9 @@ Options:
                                  exist on disk.  This will be slow and will
                                  require internet connection. This obviously
                                  only works if the Photos library is synched
-                                  to iCloud.  Note: --download-missing is not
-                                  currently compatabile with --export-bursts;
-                                  only the primary photo will be exported--
+                                  to iCloud.  Note: --download-missing does
+                                  not currently export all burst images; only
+                                  the primary photo will be exported--
                                  associated burst images will be skipped.
  --exiftool                      Use exiftool to write metadata directly to
                                  exported photos. To use this option,
@@ -232,11 +275,16 @@ Options:
                                  output directory in the form
                                  '{name,DEFAULT}'. See below for additional
                                  details on templating system.
+  --no-extended-attributes        Don't copy extended attributes when
+                                  exporting.  You only need this if exporting
+                                  to a filesystem that doesn't support Mac OS
+                                  extended attributes.  Only use this if you
+                                  get an error while exporting.
  -h, --help                      Show this message and exit.

 **Templating System**

-With the --directory option, you may specify a template for the export
+With the --directory option you may specify a template for the export
 directory.  This 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 desitnation DEST is
@@ -244,6 +292,11 @@ the export DEST argument to export.  For example, if template is
 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 a an error and the script will abort.
@@ -256,7 +309,7 @@ rendered name, use double braces, e.g. '{{' or '}}', thus using
 You may specify an optional default value to use if the substitution does not
 contain a value (e.g. the value is null) by specifying the default value after
 a ',' in the template string: for example, if template is
-'{created.year}/{place.address,'NO_ADDRESS'}' but there was no address
+'{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 '}').
@@ -268,7 +321,7 @@ I plan to eventually extend the templating system to the exported filename so
 you can specify the filename using a template.

 Substitution                    Description
-{name}                          Filename of the photo
+{name}                          Current filename of the photo
 {original_name}                 Photo's original filename when imported to
                                Photos
 {title}                         Title of the photo
@@ -334,19 +387,22 @@ exported, one to each directory.  For example: --directory
 of the following directories if the photos were created in 2019 and were in
 albums 'Vacation' and 'Family': 2019/Vacation, 2019/Family

-Substitution  Description
-{album}       Album(s) photo is contained in
-{keyword}     Keyword(s) assigned to photo
-{person}      Person(s) / face(s) in a photo
+Substitution    Description
+{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
+{person}        Person(s) / face(s) in a photo
 ```

-Example: export all photos to ~/Desktop/export, including edited versions and live photo movies, group in folders by date created
+Example: export all photos to ~/Desktop/export group in folders by date created

-`osxphotos export --export-edited --export-live --export-by-date ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export`
+`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-edited --export-live --export-by-date --db ~/Pictures/Photos\ Library.photoslibrary ~/Desktop/export`
+`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:

@@ -646,6 +702,29 @@ Returns a dictionary of shared albums (e.g. shared via iCloud photo sharing) fou

 **Note**: *Photos 5 / MacOS 10.15 only*.  On earlier versions of Photos, prints warning and returns empty dictionary.

+#### `labels`
+Returns image categorization labels associated with photos in the library as list of str.
+
+**Note**: Only valid on Photos 5; on earlier versions, returns empty list. In Photos 5, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels_normalized](#labels_normalized).  
+
+#### `labels_normalized`
+Returns image categorization labels associated with photos in the library as list of str. Labels are normalized (e.g. converted to lower case).  Use of normalized strings makes it easier to search if you don't how Apple capitalizes a label.
+
+**Note**: Only valid on Photos 5; on earlier versions, returns empty list. In Photos 5, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels](#labels).  
+
+#### `labels_as_dict`
+Returns dictionary image categorization labels associated with photos in the library where key is label and value is number of photos in the library with the label.
+
+**Note**: Only valid on Photos 5; on earlier versions, logs warning and returns empty dict. In Photos 5, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels_normalized_as_dict](#labels_normalized_as_dict).  
+
+#### `labels_normalized_as_dict`
+Returns dictionary of image categorization labels associated with photos in the library where key is normalized label and value is number of photos in the library with that label. Labels are normalized (e.g. converted to lower case).  Use of normalized strings makes it easier to search if you don't how Apple capitalizes a label.
+
+**Note**: Only valid on Photos 5; on earlier versions, logs warning and returns empty dict. In Photos 5, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels_as_dict](#labels_as_dict).  
+
+
+
+
 #### `library_path`
 ```python
 # assumes photosdb is a PhotosDB object (see above)
@@ -783,6 +862,7 @@ For example, in my library, Photos says I have 19,386 photos and 474 movies.  Ho
 >>>
 ```

+
 ### PhotoInfo 
 PhotosDB.photos() returns a list of PhotoInfo objects.  Each PhotoInfo object represents a single photo in the Photos library.

@@ -924,15 +1004,85 @@ Returns True if photo is a panorama, otherwise False.

 **Note**: The result of `PhotoInfo.panorama` will differ from the "Panoramas" Media Types smart album in that it will also identify panorama photos from older phones that Photos does not recognize as panoramas. 

+#### `labels`
+Returns image categorization labels associated with the photo as list of str.
+
+**Note**: Only valid on Photos 5; on earlier versions, returns empty list. In Photos 5, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels_normalized](#labels_normalized).  
+
+#### `labels_normalized`
+Returns image categorization labels associated with the photo as list of str. Labels are normalized (e.g. converted to lower case).  Use of normalized strings makes it easier to search if you don't how Apple capitalizes a label. For example:
+
+```python
+import osxphotos
+
+photosdb = osxphotos.PhotosDB()
+for photo in photosdb.photos():
+    if "statue" in photo.labels_normalized:
+        print(f"I found a statue! {photo.original_filename}")
+```
+
+**Note**: Only valid on Photos 5; on earlier versions, returns empty list. In Photos 5, Photos runs machine learning image categorization against photos in the library and automatically assigns labels to photos such as "People", "Dog", "Water", etc.  A photo may have zero or more labels associated with it.  See also [labels](#labels).  
+
+#### `exif_info`
+Returns an [ExifInfo](#exifinfo) object with EXIF details from the Photos database.  See [ExifInfo](#exifinfo) for additional details.
+
+**Note**: Only valid on Photos 5; on earlier versions, returns `None`.  The EXIF details returned are a subset of the actual EXIF data in a typical image.  At import Photos stores this subset in the database and it's this stored data that `exif_info` returns.
+
+See also `exiftool`.
+
+#### `exiftool`
+Returns an ExifTool object for the photo which provides an interface to [exiftool](https://exiftool.org/) allowing you to read or write the actual EXIF data in the image file inside the Photos library.  If [exif_info](#exif-info) doesn't give you all the data you need, you can use `exiftool` to read the entire EXIF contents of the image.
+
+If the file is missing from the library (e.g. not downloaded from iCloud), returns None. 
+
+exiftool must be installed in the path for this to work.  If exiftool cannot be found in the path, calling `exiftool` will log a warning and return `None`.  You can check the exiftool path using `osxphotos.exiftool.get_exiftool_path` which will raise FileNotFoundError if exiftool cannot be found.
+
+```python
+>>> import osxphotos
+>>> osxphotos.exiftool.get_exiftool_path()
+'/usr/local/bin/exiftool'
+>>>
+```
+
+`ExifTool` provides the following methods:
+
+- `as_dict()`: 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.
+```python
+{'Composite:Aperture': 2.2,
+ 'Composite:GPSPosition': '-34.9188916666667 138.596861111111',
+ 'Composite:ImageSize': '2754 2754',
+ 'EXIF:CreateDate': '2017:06:20 17:18:56',
+ 'EXIF:LensMake': 'Apple',
+ 'EXIF:LensModel': 'iPhone 6s back camera 4.15mm f/2.2',
+ 'EXIF:Make': 'Apple',
+ 'XMP:Title': 'Elder Park',
+}
+```
+
+- `json()`: returns same information as `as_dict()` but as a serialized JSON string.
+
+- `setvalue(tag, value)`: write to the EXIF data in the photo file. To delete a tag, use setvalue with value = `None`. For example:
+```python
+photo.exiftool.setvalue("XMP:Title", "Title of photo")
+```
+- `addvalues(tag, *values)`: Add one or more value(s) to tag.  For a tag that accepts multiple values, like "IPTC:Keywords", this will add the values as additional list values.  However, for tags which are not usually lists, such as "EXIF:ISO" this will literally add the new value to the old value which is probably not the desired effect.  Be sure you understand the behavior of the individual tag before using this. For example:
+```python
+photo.exiftool.addvalues("IPTC:Keywords", "vacation", "beach")
+```
+
+**Caution**: I caution against  writing new EXIF data to photos in the Photos library because this will overwrite the original copy of the photo and could adversely affect how Photos behaves.  `exiftool.as_dict()` is useful for getting access to all the photos information but if you want to write new EXIF data, I recommend you export the photo first then write the data.  [PhotoInfo.export()](#export) does this if called with `exiftool=True`.
+
 #### `json()`
 Returns a JSON representation of all photo info 

-#### `export(dest, *filename, edited=False, live_photo=False, overwrite=False, increment=True, sidecar_json=False, sidecar_xmp=False, use_photos_export=False, timeout=120, exiftool=False, no_xattr=False)`
+#### `export()`
+`export(dest, *filename, edited=False, live_photo=False, export_as_hardlink=False, overwrite=False, increment=True, sidecar_json=False, sidecar_xmp=False, use_photos_export=False, timeout=120, exiftool=False, no_xattr=False, use_albums_as_keywords=False, use_persons_as_keywords=False)`

 Export photo from the Photos library to another destination on disk.  
 - dest: must be valid destination path as str (or exception raised).
 - *filename (optional): name of picture as str; if not provided, will use current filename.  **NOTE**: if provided, user must ensure file extension (suffix) is correct. For example, if photo is .CR2 file, edited image may be .jpeg.  If you provide an extension different than what the actual file is, export will print a warning but will happily export the photo using the incorrect file extension.  e.g. to get the extension of the edited photo, look at [PhotoInfo.path_edited](#path_edited).
 - edited: boolean; if True (default=False), will export the edited version of the photo (or raise exception if no edited version)
+- export_as_hardlink: boolean; if True (default=False), will hardlink files instead of copying them
 - overwrite: boolean; if True (default=False), will overwrite files if they alreay exist
 - live_photo: boolean; if True (default=False), will also export the associted .mov for live photos; exported live photo will be named filename.mov
 - increment: boolean; if True (default=True), will increment file name until a non-existent name is found
@@ -942,6 +1092,8 @@ Export photo from the Photos library to another destination on disk.
 - timeout: (int, default=120) timeout in seconds used with use_photos_export
 - exiftool: (boolean, default = False) if True, will use [exiftool](https://exiftool.org/) to write metadata directly to the exported photo; exiftool must be installed and in the system path
 - no_xattr: (boolean, default = False); if True, exports file without preserving extended attributes
+- use_albums_as_keywords: (boolean, default = False); if True, will use album names as keywords when exporting metadata with exiftool or sidecar
+- use_persons_as_keywords: (boolean, default = False); if True, will use person names as keywords when exporting metadata with exiftool or sidecar

 Returns: list of paths to exported files. More than one file could be exported, for example if live_photo=True, both the original imaage and the associated .mov file will be exported

@@ -963,6 +1115,63 @@ If overwrite=False and increment=False, export will fail if destination file alr

 **Implementation Note**: Because the usual python file copy methods don't preserve all the metadata available on MacOS, export uses `/usr/bin/ditto` to do the copy for export. ditto preserves most metadata such as extended attributes, permissions, ACLs, etc.

+#### <a name="rendertemplate">`render_template()`</a>
+
+`render_template(template, none_str = "_", path_sep = None)`
+Render template string for photo.  none_str is used if template substitution results in None value and no default specified. 
+- `template`: str in form "{name,DEFAULT}" where name is one of the values in table below. The "," and default value that follows are optional. If specified, "DEFAULT" will be used if "name" is None.  This is useful for values which are not always present, for example reverse geolocation data.
+- `none_str`: optional str to use as substitution when template value is None and no default specified in the template string.  default is "_".
+- `path_sep`: optional character to use as path separator, default is os.path.sep
+
+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"].
+
+e.g. `render_filepath_template("{created.year}/{foo}", photo)` would return `(["2020/{foo}"],["foo"])`
+
+If you want to include "{" or "}" in the output, use "{{" or "}}"
+
+e.g. `render_filepath_template("{created.year}/{{foo}}", photo)` would return `(["2020/{foo}"],[])`
+
+Some substitutions, notably `album`, `keyword`, and `person` could return multiple values, hence a new string will be return for each possible substitution (hence why a list of rendered strings is returned).  For example, a photo in 2 albums: 'Vacation' and 'Family' would result in the following rendered values if template was "{created.year}/{album}" and created.year == 2020: `["2020/Vacation","2020/Family"]` 
+
+See [Template Substitutions](#template-substitutions) for additional details.
+
+### ExifInfo
+[PhotosInfo.exif_info](#exif-info) returns an `ExifInfo` object with some EXIF data about the photo (Photos 5 only).  `ExifInfo` contains the following properties:
+
+```python
+    flash_fired: bool
+    iso: int
+    metering_mode: int
+    sample_rate: int
+    track_format: int
+    white_balance: int
+    aperture: float
+    bit_rate: float
+    duration: float
+    exposure_bias: float
+    focal_length: float
+    fps: float
+    latitude: float
+    longitude: float
+    shutter_speed: float
+    camera_make: str
+    camera_model: str
+    codec: str
+    lens_model: str
+```
+
+For example:
+
+```python
+import osxphotos
+
+nikon_photos = [
+    p
+    for p in osxphotos.PhotosDB().photos()
+    if p.exif_info.camera_make and "nikon" in p.exif_info.camera_make.lower()
+]
+```
+
 ### AlbumInfo
 PhotosDB.album_info and PhotoInfo.album_info return a list of AlbumInfo objects.  Each AlbumInfo object represents a single album in the Photos library.

@@ -1002,7 +1211,7 @@ Returns a [FolderInfo](#FolderInfo) object representing the albums parent folder


 ### FolderInfo 
-PhotosDB.folders returns a list of FolderInfo objects representing the top level folders in the library.  Each FolderInfo object represents a single folder in the Photos library.
+PhotosDB.folder_info returns a list of FolderInfo objects representing the top level folders in the library.  Each FolderInfo object represents a single folder in the Photos library.

 #### `uuid`
 Returns the universally unique identifier (uuid) of the folder.  This is how Photos keeps track of individual objects within the database.
@@ -1024,7 +1233,7 @@ Returns a [FolderInfo](#FolderInfo) object representing the folder's parent fold
 ```python
 >>> import osxphotos
 >>> photosdb = osxphotos.PhotosDB()
->>> photosdb.subfolders
+>>> photosdb.folder_info
 [<osxphotos.albuminfo.FolderInfo object at 0x10fcc0160>]
 >>> photosdb.folder_info[0].title
 'Folder1'
@@ -1108,26 +1317,9 @@ PostalAddress(street='3700 Wailea Alanui Dr', sub_locality=None, city='Kihei', s
 '96753'
 ```

-### Template Functions
-
-There is a simple template system used by the command line client to specify the output directory using a template.  The following are available in `osxphotos.template`.
-
-#### `render_filepath_template(template, photo, none_str="_")`
-Render template string for photo.  none_str is used if template substitution results in None value and no default specified. 
- `template`: str in form "{name,DEFAULT}" where name is one of the values in table below. The "," and default value that follows are optional. If specified, "DEFAULT" will be used if "name" is None.  This is useful for values which are not always present, for example reverse geolocation data.
- `photo`: a [PhotoInfo](#photoinfo) object
- `none_str`: optional str to use as substitution when template value is None and no default specified in the template string.  default is "_".
-
-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"].
-
-e.g. `render_filepath_template("{created.year}/{foo}", photo)` would return `(["2020/{foo}"],["foo"])`
-
-If you want to include "{" or "}" in the output, use "{{" or "}}"
-
-e.g. `render_filepath_template("{created.year}/{{foo}}", photo)` would return `(["2020/{foo}"],[])`
-
-Some substitutions, notably `album`, `keyword`, and `person` could return multiple values, hence a new string will be return for each possible substitution (hence why a list of rendered strings is returned).  For example, a photo in 2 albums: 'Vacation' and 'Family' would result in the following rendered values if template was "{created.year}/{album}" and created.year == 2020: `["2020/Vacation","2020/Family"]` 
+### Template Substitutions

+The following substitutions are availabe for use with `PhotoInfo.render_template()` 

 | Substitution | Description |
 |--------------|-------------|
@@ -1167,21 +1359,6 @@ Some substitutions, notably `album`, `keyword`, and `person` could return multip
 |{person}|Person(s) / face(s) in a photo|


-#### `DateTimeFormatter(dt)`
-Class that provides easy access to formatted datetime values.
- `dt`: a datetime.datetime object
-
-Returnes `DateTimeFormater` class.
-
-Has the following properties:
- `date`: Date in ISO format without timezone, e.g. "2020-03-04"
- `year`: 4-digit year
- `yy`: 2-digit year
- `month`: month name in user's locale
- `mon`: month abbreviation in user's locale
- `mm`: 2-digit month
- `doy`: 3-digit day of year (e.g. Julian day)
-
 ### Utility Functions

 The following functions are located in osxphotos.utils
@@ -1283,13 +1460,22 @@ If you have an interesting example that shows usage of this package, submit an i

 Testing against "real world" Photos libraries would be especially helpful.  If you discover issues in testing against your Photos libraries, please open an issue.  I've done extensive testing against my own Photos library but that's a since data point and I'm certain there are issues lurking in various edge cases I haven't discovered yet.

+## Known Bugs
+
+My goal is make osxphotos as reliable and comprehensive as possible.  The test suite currently has over 400 tests--but there are still some [bugs](https://github.com/RhetTbull/osxphotos/issues?q=is%3Aissue+is%3Aopen+label%3Abug) or incomplete features lurking.  If you find bugs please open an [issue](https://github.com/RhetTbull/osxphotos/issues).  Notable issues include:
+
+- RAW images imported to Photos with an associated jpeg preview are not handled correctly by osxphotos.  osxphotos query and export will operate on the jpeg preview instead of the RAW image as will `PhotoInfo.path`.  If the user selects "Use RAW as original" in Photos, the RAW image will be exported or operated on but the jpeg will be ignored.  See [Issue #101](https://github.com/RhetTbull/osxphotos/issues/101) Note: Beta version of fix for this bug is implemented in the current version of osxphotos.
+- The `--download-missing` option for `osxphotos export` does not work correctly with burst images.  It will download the primary image but not the other burst images.  See [Issue #75](https://github.com/RhetTbull/osxphotos/issues/75)
+
 ## Implementation Notes

-This package works by creating a copy of the sqlite3 database that photos uses to store data about the photos library. the class photosdb then queries this database to extract information about the photos such as persons (faces identified in the photos), albums, keywords, etc.  If your library is large, the database can be hundreds of MB in size and the copy read then  can take many 10s of seconds to complete.  Once copied, the entire database is processed and an in-memory data structure is created meaning all subsequent accesses of the PhotosDB object occur much more quickly. 
+This package works by creating a copy of the sqlite3 database that photos uses to store data about the photos library. The class PhotosDB then queries this database to extract information about the photos such as persons (faces identified in the photos), albums, keywords, etc.  If your library is large, the database can be hundreds of MB in size and the copy read then  can take many 10s of seconds to complete.  Once copied, the entire database is processed and an in-memory data structure is created meaning all subsequent accesses of the PhotosDB object occur much more quickly. 

 If apple changes the database format this will likely break.

-Apple does provide a framework ([PhotoKit](https://developer.apple.com/documentation/photokit?language=objc)) for querying the user's Photos library and I attempted to create the funcationality in this package using this framework but unfortunately PhotoKit does not provide access to much of the needed metadata (such as Faces/Persons).  While copying the sqlite file is a bit kludgy, it allows osxphotos to provide access to all available metadata.
+Apple does provide a framework ([PhotoKit](https://developer.apple.com/documentation/photokit?language=objc)) for querying the user's Photos library and I attempted to create the funcationality in this package using this framework but unfortunately PhotoKit does not provide access to much of the needed metadata (such as Faces/Persons) and Apple's System Integrity Protection (SIP) made the interface unreliable.  If you'd like to experiment with the PhotoKit interface, here's some sample [code](https://gist.github.com/RhetTbull/41cc85e5bdeb30f761147ce32fba5c94).  While copying the sqlite file is a bit kludgy, it allows osxphotos to provide access to all available metadata.
+
+For additional details about how osxphotos is implemented or if you would like to extend the code, see the [wiki](https://github.com/RhetTbull/osxphotos/wiki).

 ## Dependencies
 - [PyObjC](https://pythonhosted.org/pyobjc/)
--- a/cli.py
+++ b/cli.py
@@ -0,0 +1,19 @@
+""" stand alone command line script for use with pyinstaller
+    
+    To build this into an executable:
+    - install pyinstaller:
+        python3 -m pip install pyinstaller
+    - then use make_cli_exe.sh to run pyinstaller or execute the following command:
+        pyinstaller --onefile --hidden-import="pkg_resources.py2_warn" --name osxphotos --add-data osxphotos/templates/xmp_sidecar.mako:osxphotos/templates cli.py
+
+    Resulting executable will be in "dist/osxphotos"
+
+    Note: This is *not* the cli that "python3 -m pip install osxphotos" or "python setup.py install" would install;
+    it's merely a wrapper around __main__.py to allow pyinstaller to work
+    
+"""
+
+from osxphotos.__main__ import cli
+
+if __name__ == "__main__":
+    cli()
--- a/examples/examples.py
+++ b/examples/examples.py
@@ -14,7 +14,7 @@ def main():

    print(photosdb.keywords)
    print(photosdb.persons)
-    print(photosdb.album_names)
+    print(photosdb.albums)

    print(photosdb.keywords_as_dict)
    print(photosdb.persons_as_dict)
--- a/make_cli_exe.sh
+++ b/make_cli_exe.sh
@@ -0,0 +1,8 @@
+#!/bin/sh 
+
+# This will build an stand-alone executable called 'osxphotos' in your ./dist directory
+# using pyinstaller
+# If you need to install pyinstaller:
+# python3 -m pip install --upgrade pyinstaller
+
+pyinstaller --onefile --hidden-import="pkg_resources.py2_warn" --name osxphotos --add-data osxphotos/templates/xmp_sidecar.mako:osxphotos/templates cli.py
--- a/osxphotos/main.py
+++ b/osxphotos/main.py
@@ -18,14 +18,10 @@ from pathvalidate import (

 import osxphotos

-from ._constants import _EXIF_TOOL_URL, _PHOTOS_5_VERSION, _UNKNOWN_PLACE
+from ._constants import _EXIF_TOOL_URL, _PHOTOS_4_VERSION, _UNKNOWN_PLACE
 from ._version import __version__
 from .exiftool import get_exiftool_path
-from .template import (
-    render_filepath_template,
-    TEMPLATE_SUBSTITUTIONS,
-    TEMPLATE_SUBSTITUTIONS_MULTI_VALUED,
-)
+from .template import TEMPLATE_SUBSTITUTIONS, TEMPLATE_SUBSTITUTIONS_MULTI_VALUED
 from .utils import _copy_file, create_path_by_date


@@ -83,7 +79,7 @@ class ExportCommand(click.Command):
        formatter.write_text("**Templating System**")
        formatter.write("\n")
        formatter.write_text(
-            "With the --directory option, you may specify a template for the "
+            "With the --directory option you may specify a template for the "
            + "export directory.  This 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 desitnation DEST is "
@@ -92,6 +88,13 @@ class ExportCommand(click.Command):
            + "if the photo was created in March 2020. "
        )
        formatter.write("\n")
+        formatter.write_text(
+                        "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}"'
+        )
+        formatter.write("\n")
        formatter.write_text(
            "In the template, valid template substitutions will be replaced by "
            + "the corresponding value from the table below.  Invalid substitutions will result in a "
@@ -109,7 +112,7 @@ class ExportCommand(click.Command):
            "You may specify an optional default value to use if the substitution does not contain a value "
            + "(e.g. the value is null) "
            + "by specifying the default value after a ',' in the template string: "
-            + "for example, if template is '{created.year}/{place.address,'NO_ADDRESS'}' "
+            + "for example, if template is '{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 '}')."
@@ -187,7 +190,7 @@ def query_options(f):
            metavar="KEYWORD",
            default=None,
            multiple=True,
-            help="Search for keyword KEYWORD. "
+            help="Search for photos with keyword KEYWORD. "
            'If more than one keyword, treated as "OR", e.g. find photos match any keyword',
        ),
        o(
@@ -195,7 +198,7 @@ def query_options(f):
            metavar="PERSON",
            default=None,
            multiple=True,
-            help="Search for person PERSON. "
+            help="Search for photos with person PERSON. "
            'If more than one person, treated as "OR", e.g. find photos match any person',
        ),
        o(
@@ -203,15 +206,24 @@ def query_options(f):
            metavar="ALBUM",
            default=None,
            multiple=True,
-            help="Search for album ALBUM. "
+            help="Search for photos in album ALBUM. "
            'If more than one album, treated as "OR", e.g. find photos match any album',
        ),
+        o(
+            "--folder",
+            metavar="FOLDER",
+            default=None,
+            multiple=True,
+            help="Search for photos in an album in folder FOLDER. "
+            'If more than one folder, treated as "OR", e.g. find photos in any FOLDER.  '
+            "Only searches top level folders (e.g. does not look at subfolders)",
+        ),
        o(
            "--uuid",
            metavar="UUID",
            default=None,
            multiple=True,
-            help="Search for UUID(s).",
+            help="Search for photos with UUID(s).",
        ),
        o(
            "--title",
@@ -336,6 +348,11 @@ def query_options(f):
            is_flag=True,
            help="Search for photos that are not panoramas.",
        ),
+        o(
+            "--has-raw",
+            is_flag=True,
+            help="Search for photos with both a jpeg and RAW version",
+        ),
        o(
            "--only-movies",
            is_flag=True,
@@ -414,7 +431,7 @@ def albums(ctx, cli_obj, db, json_, photos_library):

    photosdb = osxphotos.PhotosDB(dbfile=db)
    albums = {"albums": photosdb.albums_as_dict}
-    if photosdb.db_version >= _PHOTOS_5_VERSION:
+    if photosdb.db_version > _PHOTOS_4_VERSION:
        albums["shared albums"] = photosdb.albums_shared_as_dict

    if json_ or cli_obj.json:
@@ -479,7 +496,7 @@ def info(ctx, cli_obj, db, json_, photos_library):
    not_shared_movies = [p for p in movies if not p.shared]
    info["movie_count"] = len(not_shared_movies)

-    if pdb.db_version >= _PHOTOS_5_VERSION:
+    if pdb.db_version > _PHOTOS_4_VERSION:
        shared_photos = [p for p in photos if p.shared]
        info["shared_photo_count"] = len(shared_photos)

@@ -494,7 +511,7 @@ def info(ctx, cli_obj, db, json_, photos_library):
    info["albums_count"] = len(albums)
    info["albums"] = albums

-    if pdb.db_version >= _PHOTOS_5_VERSION:
+    if pdb.db_version > _PHOTOS_4_VERSION:
        albums_shared = pdb.albums_shared_as_dict
        info["shared_albums_count"] = len(albums_shared)
        info["shared_albums"] = albums_shared
@@ -670,6 +687,7 @@ def query(
    keyword,
    person,
    album,
+    folder,
    uuid,
    title,
    no_title,
@@ -714,6 +732,7 @@ def query(
    not_selfie,
    panorama,
    not_panorama,
+    has_raw,
    place,
    no_place,
 ):
@@ -728,10 +747,12 @@ def query(
        keyword,
        person,
        album,
+        folder,
        uuid,
        edited,
        external_edit,
        uti,
+        has_raw,
        from_date,
        to_date,
    ]
@@ -781,6 +802,7 @@ def query(
        keyword=keyword,
        person=person,
        album=album,
+        folder=folder,
        uuid=uuid,
        title=title,
        no_title=no_title,
@@ -824,6 +846,7 @@ def query(
        not_selfie=not_selfie,
        panorama=panorama,
        not_panorama=not_panorama,
+        has_raw=has_raw,
        place=place,
        no_place=no_place,
    )
@@ -835,8 +858,13 @@ def query(

@cli.command(cls=ExportCommand)
@DB_OPTION
-@query_options
@click.option("--verbose", "-V", is_flag=True, help="Print verbose output.")
+@query_options
+@click.option(
+    "--export-as-hardlink",
+    is_flag=True,
+    help="Hardlink files instead of copying them. ",
+)
@click.option(
    "--overwrite",
    is_flag=True,
@@ -852,27 +880,57 @@ def query(
    "(e.g. DEST/2019/12/20/photoname.jpg).",
 )
@click.option(
-    "--export-edited",
+    "--skip-edited",
    is_flag=True,
-    help="Also export edited version of photo if an edited version exists.  "
-    'Edited photo will be named in form of "photoname_edited.ext"',
+    help="Do not export edited version of photo if an edited version exists.",
 )
@click.option(
-    "--export-bursts",
+    "--skip-bursts",
    is_flag=True,
-    help="If a photo is a burst photo export all associated burst images in the library.  "
-    "Not currently compatible with --download-misssing; see note on --download-missing.",
+    help="Do not export all associated burst images in the library if a photo is a burst photo.  ",
 )
@click.option(
-    "--export-live",
+    "--skip-live",
    is_flag=True,
-    help="If a photo is a live photo export the associated live video component."
-    "  Live video will have same name as photo but with .mov extension. ",
+    help="Do not export the associated live video component of a live photo.",
 )
@click.option(
-    "--original-name",
+    "--skip-raw",
    is_flag=True,
-    help="Use photo's original filename instead of current filename for export.",
+    help="Do not export associated RAW images of a RAW/jpeg pair.  "
+    "Note: this does not skip RAW photos if the RAW photo does not have an associated jpeg image "
+    "(e.g. the RAW file was imported to Photos without a jpeg preview).",
+)
+@click.option(
+    "--person-keyword",
+    is_flag=True,
+    help="Use person in image as keyword/tag when exporting metadata.",
+)
+@click.option(
+    "--album-keyword",
+    is_flag=True,
+    help="Use album name as keyword/tag when exporting metadata.",
+)
+@click.option(
+    "--keyword-template",
+    metavar="TEMPLATE",
+    multiple=True,
+    default=None,
+    help="For use with --exiftool, --sidecar; specify a template string to use as "
+    "keyword in the form '{name,DEFAULT}' "
+    "This is the same format as --directory.  For example, if you wanted to add "
+    "the full path to the folder and album photo is contained in as a keyword when exporting "
+    'you could specify --keyword-template "{folder_album}" '
+    'You may specify more than one template, for example --keyword-template "{folder_album}" '
+    '--keyword-template "{created.year}" '
+    "See Templating System below.",
+)
+@click.option(
+    "--current-name",
+    is_flag=True,
+    help="Use photo's current filename instead of original filename for export.  "
+    "Note: Starting with Photos 5, all photos are renamed upon import.  By default, "
+    "photos are exported with the the original name they had before import.",
 )
@click.option(
    "--sidecar",
@@ -895,7 +953,7 @@ def query(
    "to interact with Photos to export the photo which will force Photos to download from iCloud if "
    "the photo does not exist on disk.  This will be slow and will require internet connection. "
    "This obviously only works if the Photos library is synched to iCloud.  "
-    "Note: --download-missing is not currently compatabile with --export-bursts; "
+    "Note: --download-missing does not currently export all burst images; "
    "only the primary photo will be exported--associated burst images will be skipped.",
 )
@click.option(
@@ -932,6 +990,7 @@ def export(
    keyword,
    person,
    album,
+    folder,
    uuid,
    title,
    no_title,
@@ -950,12 +1009,17 @@ def export(
    from_date,
    to_date,
    verbose,
+    export_as_hardlink,
    overwrite,
    export_by_date,
-    export_edited,
-    export_bursts,
-    export_live,
-    original_name,
+    skip_edited,
+    skip_bursts,
+    skip_live,
+    skip_raw,
+    person_keyword,
+    album_keyword,
+    keyword_template,
+    current_name,
    sidecar,
    only_photos,
    only_movies,
@@ -980,6 +1044,7 @@ def export(
    not_selfie,
    panorama,
    not_panorama,
+    has_raw,
    directory,
    place,
    no_place,
@@ -991,6 +1056,10 @@ def export(
        if more than one option is provided, they are treated as "AND" 
        (e.g. search for photos matching all options).
        If no query options are provided, all photos will be exported.
+        By default, all versions of all photos will be exported including edited
+        versions, live photo movies, burst photos, and associated RAW images. 
+        See --skip-edited, --skip-live, --skip-bursts, and --skip-raw options
+        to modify this behavior. 
    """

    if not os.path.isdir(dest):
@@ -1019,6 +1088,17 @@ def export(
        click.echo(cli.commands["export"].get_help(ctx), err=True)
        return

+    # initialize export flags
+    # by default, will export all versions of photos unless skip flag is set
+    (export_edited, export_bursts, export_live, export_raw) = [
+        not x for x in [skip_edited, skip_bursts, skip_live, skip_raw]
+    ]
+
+    # though the command line option is current_name, internally all processing
+    # logic uses original_name which is the boolean inverse of current_name
+    # because the original code used --original-name as an option
+    original_name = not current_name
+
    # verify exiftool installed an in path
    if exiftool:
        try:
@@ -1051,6 +1131,7 @@ def export(
        keyword=keyword,
        person=person,
        album=album,
+        folder=folder,
        uuid=uuid,
        title=title,
        no_title=no_title,
@@ -1094,6 +1175,7 @@ def export(
        not_selfie=not_selfie,
        panorama=panorama,
        not_panorama=not_panorama,
+        has_raw=has_raw,
        place=place,
        no_place=no_place,
    )
@@ -1119,6 +1201,7 @@ def export(
                        verbose,
                        export_by_date,
                        sidecar,
+                        export_as_hardlink,
                        overwrite,
                        export_edited,
                        original_name,
@@ -1127,6 +1210,10 @@ def export(
                        exiftool,
                        directory,
                        no_extended_attributes,
+                        export_raw,
+                        album_keyword,
+                        person_keyword,
+                        keyword_template,
                    )
        else:
            for p in photos:
@@ -1136,6 +1223,7 @@ def export(
                    verbose,
                    export_by_date,
                    sidecar,
+                    export_as_hardlink,
                    overwrite,
                    export_edited,
                    original_name,
@@ -1144,6 +1232,10 @@ def export(
                    exiftool,
                    directory,
                    no_extended_attributes,
+                    export_raw,
+                    album_keyword,
+                    person_keyword,
+                    keyword_template,
                )
                if export_paths:
                    click.echo(f"Exported {p.filename} to {export_paths}")
@@ -1218,6 +1310,9 @@ def print_photo_info(photos, json=False):
                "hdr",
                "selfie",
                "panorama",
+                "has_raw",
+                "uti_raw",
+                "path_raw",
            ]
        )
        for p in photos:
@@ -1259,6 +1354,9 @@ def print_photo_info(photos, json=False):
                    p.hdr,
                    p.selfie,
                    p.panorama,
+                    p.has_raw,
+                    p.uti_raw,
+                    p.path_raw,
                ]
            )
        for row in dump:
@@ -1270,6 +1368,7 @@ def _query(
    keyword=None,
    person=None,
    album=None,
+    folder=None,
    uuid=None,
    title=None,
    no_title=None,
@@ -1313,13 +1412,14 @@ def _query(
    not_selfie=None,
    panorama=None,
    not_panorama=None,
+    has_raw=None,
    place=None,
    no_place=None,
 ):
-    """ 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 
+        arguments must be passed in same order as query and export 
+        if either is modified, need to ensure all three functions are updated """

    photosdb = osxphotos.PhotosDB(dbfile=db)
    photos = photosdb.photos(
@@ -1333,6 +1433,21 @@ def _query(
        to_date=to_date,
    )

+    if folder:
+        # search for photos in an album in folder
+        # finds photos that have albums whose top level folder matches folder
+        photo_list = []
+        for f in folder:
+            photo_list.extend(
+                [
+                    p
+                    for p in photos
+                    if p.album_info
+                    and f in [a.folder_names[0] for a in p.album_info if a.folder_names]
+                ]
+            )
+        photos = photo_list
+
    if title:
        # search title field for text
        # if more than one, find photos with all title values in title
@@ -1486,6 +1601,9 @@ def _query(
    elif not_incloud:
        photos = [p for p in photos if not p.incloud]

+    if has_raw:
+        photos = [p for p in photos if p.has_raw]
+
    return photos


@@ -1495,6 +1613,7 @@ def export_photo(
    verbose,
    export_by_date,
    sidecar,
+    export_as_hardlink,
    overwrite,
    export_edited,
    original_name,
@@ -1503,6 +1622,10 @@ def export_photo(
    exiftool,
    directory,
    no_extended_attributes,
+    export_raw,
+    album_keyword,
+    person_keyword,
+    keyword_template,
 ):
    """ Helper function for export that does the actual export
        photo: PhotoInfo object
@@ -1510,6 +1633,7 @@ def export_photo(
        verbose: boolean; print verbose output
        export_by_date: boolean; create export folder in form dest/YYYY/MM/DD
        sidecar: list zero, 1 or 2 of ["json","xmp"] of sidecar variety to export
+        export_as_hardlink: boolean; hardlink files instead of copying them
        overwrite: boolean; overwrite dest file if it already exists
        original_name: boolean; use original filename instead of current filename
        export_live: boolean; also export live video component if photo is a live photo
@@ -1518,6 +1642,10 @@ def export_photo(
        exiftool: use exiftool to write EXIF metadata directly to exported photo
        directory: template used to determine output directory
        no_extended_attributes: boolean; if True, exports photo without preserving extended attributes
+        export_raw: boolean; if True exports RAW image associate with the photo
+        album_keyword: boolean; if True, exports album names as keywords in metadata
+        person_keyword: boolean; if True, exports person names as keywords in metadata
+        keyword_template: list of strings; if provided use rendered template strings as keywords
        returns list of path(s) of exported photo or None if photo was missing 
    """

@@ -1558,7 +1686,7 @@ def export_photo(
        dest_paths = [dest_path]
    elif directory:
        # got a directory template, render it and check results are valid
-        dirnames, unmatched = render_filepath_template(directory, photo)
+        dirnames, unmatched = photo.render_template(directory)
        if unmatched:
            raise click.BadOptionUsage(
                "directory",
@@ -1596,10 +1724,15 @@ def export_photo(
            sidecar_json=sidecar_json,
            sidecar_xmp=sidecar_xmp,
            live_photo=export_live,
+            raw_photo=export_raw,
+            export_as_hardlink=export_as_hardlink,
            overwrite=overwrite,
            use_photos_export=use_photos_export,
            exiftool=exiftool,
            no_xattr=no_extended_attributes,
+            use_albums_as_keywords=album_keyword,
+            use_persons_as_keywords=person_keyword,
+            keyword_template=keyword_template,
        )[0]
        photo_paths.append(photo_path)

@@ -1630,11 +1763,15 @@ def export_photo(
                    edited_name,
                    sidecar_json=sidecar_json,
                    sidecar_xmp=sidecar_xmp,
+                    export_as_hardlink=export_as_hardlink,
                    overwrite=overwrite,
                    edited=True,
                    use_photos_export=use_photos_export,
                    exiftool=exiftool,
                    no_xattr=no_extended_attributes,
+                    use_albums_as_keywords=album_keyword,
+                    use_persons_as_keywords=person_keyword,
+                    keyword_template=keyword_template,
                )

    return photo_paths
--- a/osxphotos/_constants.py
+++ b/osxphotos/_constants.py
@@ -16,8 +16,9 @@ _TESTED_DB_VERSIONS = ["6000", "4025", "4016", "3301", "2622"]
 # only version 3 - 4 have RKVersion.selfPortrait
 _PHOTOS_3_VERSION = "3301"

-# versions later than this have a different database structure
-_PHOTOS_5_VERSION = "6000"
+# versions 5.0 and later have a different database structure
+_PHOTOS_4_VERSION = "4025"  # latest Mojove version on 10.14.6
+_PHOTOS_5_VERSION = "6000"  # seems to be current on 10.15.1 through 10.15.4

 # which major version operating systems have been tested
 _TESTED_OS_VERSIONS = ["12", "13", "14", "15"]
@@ -46,3 +47,19 @@ _PHOTOS_5_ALBUM_KIND = 2  # normal user album
 _PHOTOS_5_SHARED_ALBUM_KIND = 1505  # shared album
 _PHOTOS_5_FOLDER_KIND = 4000  # user folder
 _PHOTOS_5_ROOT_FOLDER_KIND = 3999  # root folder
+
+_PHOTOS_4_ALBUM_KIND = 3  # RKAlbum.albumSubclass
+_PHOTOS_4_TOP_LEVEL_ALBUM = "TopLevelAlbums"
+_PHOTOS_4_ROOT_FOLDER = "LibraryFolder"
+
+# EXIF related constants
+# max keyword length for IPTC:Keyword, reference
+# https://www.iptc.org/std/photometadata/documentation/userguide/
+_MAX_IPTC_KEYWORD_LEN = 64
+
+# Sentinel value for detecting if a template in keyword_template doesn't match
+# If anyone has a keyword matching this, then too bad...
+_OSXPHOTOS_NONE_SENTINEL = "OSXPhotosXYZZY42_Sentinel$"
+
+# SearchInfo categories for Photos 5, corresponds to categories in database/search/psi.sqlite
+SEARCH_CATEGORY_LABEL = 2024
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.27.3"
+__version__ = "0.28.18"
--- a/osxphotos/albuminfo.py
+++ b/osxphotos/albuminfo.py
@@ -12,7 +12,13 @@ PhotosDB.folders() returns a list of FolderInfo objects

 import logging

-from ._constants import _PHOTOS_5_ALBUM_KIND, _PHOTOS_5_FOLDER_KIND, _PHOTOS_5_VERSION
+from ._constants import (
+    _PHOTOS_4_ALBUM_KIND,
+    _PHOTOS_4_TOP_LEVEL_ALBUM,
+    _PHOTOS_4_VERSION,
+    _PHOTOS_5_ALBUM_KIND,
+    _PHOTOS_5_FOLDER_KIND,
+)


 class AlbumInfo:
@@ -53,14 +59,13 @@ class AlbumInfo:
            ["Top level folder", "sub folder 1", "sub folder 2", ...]
            returns empty list if album is not in any folders """

-        if self._db._db_version < _PHOTOS_5_VERSION:
-            logging.warning("Folders not yet implemented for this DB version")
-            return []
-
        try:
            return self._folder_names
        except AttributeError:
-            self._folder_names = self._db._album_folder_hierarchy_list(self._uuid)
+            if self._db._db_version <= _PHOTOS_4_VERSION:
+                self._folder_names = self._db._album_folder_hierarchy_list(self._uuid)
+            else:
+                self._folder_names = self._db._album_folder_hierarchy_list(self._uuid)
            return self._folder_names

    @property
@@ -70,10 +75,6 @@ class AlbumInfo:
            ["Top level folder", "sub folder 1", "sub folder 2", ...]
            returns empty list if album is not in any folders """

-        if self._db._db_version < _PHOTOS_5_VERSION:
-            logging.warning("Folders not yet implemented for this DB version")
-            return []
-
        try:
            return self._folders
        except AttributeError:
@@ -83,19 +84,23 @@ class AlbumInfo:
    @property
    def parent(self):
        """ returns FolderInfo object for parent folder or None if no parent (e.g. top-level album) """
-        if self._db._db_version < _PHOTOS_5_VERSION:
-            logging.warning("Folders not yet implemented for this DB version")
-            return None
-
        try:
            return self._parent
        except AttributeError:
-            parent_pk = self._db._dbalbum_details[self._uuid]["parentfolder"]
-            self._parent = (
-                FolderInfo(db=self._db, uuid=self._db._dbalbums_pk[parent_pk])
-                if parent_pk != self._db._folder_root_pk
-                else None
-            )
+            if self._db._db_version <= _PHOTOS_4_VERSION:
+                parent_uuid = self._db._dbalbum_details[self._uuid]["folderUuid"]
+                self._parent = (
+                    FolderInfo(db=self._db, uuid=parent_uuid)
+                    if parent_uuid != _PHOTOS_4_TOP_LEVEL_ALBUM
+                    else None
+                )
+            else:
+                parent_pk = self._db._dbalbum_details[self._uuid]["parentfolder"]
+                self._parent = (
+                    FolderInfo(db=self._db, uuid=self._db._dbalbums_pk[parent_pk])
+                    if parent_pk != self._db._folder_root_pk
+                    else None
+                )
            return self._parent

    def __len__(self):
@@ -112,8 +117,12 @@ class FolderInfo:
    def __init__(self, db=None, uuid=None):
        self._uuid = uuid
        self._db = db
-        self._pk = self._db._dbalbum_details[uuid]["pk"]
-        self._title = self._db._dbalbum_details[uuid]["title"]
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            self._pk = None
+            self._title = self._db._dbfolder_details[uuid]["name"]
+        else:
+            self._pk = self._db._dbalbum_details[uuid]["pk"]
+            self._title = self._db._dbalbum_details[uuid]["title"]

    @property
    def title(self):
@@ -131,13 +140,22 @@ class FolderInfo:
        try:
            return self._albums
        except AttributeError:
-            albums = [
-                AlbumInfo(db=self._db, uuid=album)
-                for album, detail in self._db._dbalbum_details.items()
-                if not detail["intrash"]
-                and detail["kind"] == _PHOTOS_5_ALBUM_KIND
-                and detail["parentfolder"] == self._pk
-            ]
+            if self._db._db_version <= _PHOTOS_4_VERSION:
+                albums = [
+                    AlbumInfo(db=self._db, uuid=album)
+                    for album, detail in self._db._dbalbum_details.items()
+                    if not detail["intrash"]
+                    and detail["albumSubclass"] == _PHOTOS_4_ALBUM_KIND
+                    and detail["folderUuid"] == self._uuid
+                ]
+            else:
+                albums = [
+                    AlbumInfo(db=self._db, uuid=album)
+                    for album, detail in self._db._dbalbum_details.items()
+                    if not detail["intrash"]
+                    and detail["kind"] == _PHOTOS_5_ALBUM_KIND
+                    and detail["parentfolder"] == self._pk
+                ]
            self._albums = albums
            return self._albums

@@ -147,12 +165,20 @@ class FolderInfo:
        try:
            return self._parent
        except AttributeError:
-            parent_pk = self._db._dbalbum_details[self._uuid]["parentfolder"]
-            self._parent = (
-                FolderInfo(db=self._db, uuid=self._db._dbalbums_pk[parent_pk])
-                if parent_pk != self._db._folder_root_pk
-                else None
-            )
+            if self._db._db_version <= _PHOTOS_4_VERSION:
+                parent_uuid = self._db._dbfolder_details[self._uuid]["parentFolderUuid"]
+                self._parent = (
+                    FolderInfo(db=self._db, uuid=parent_uuid)
+                    if parent_uuid != _PHOTOS_4_TOP_LEVEL_ALBUM
+                    else None
+                )
+            else:
+                parent_pk = self._db._dbalbum_details[self._uuid]["parentfolder"]
+                self._parent = (
+                    FolderInfo(db=self._db, uuid=self._db._dbalbums_pk[parent_pk])
+                    if parent_pk != self._db._folder_root_pk
+                    else None
+                )
            return self._parent

    @property
@@ -161,13 +187,22 @@ class FolderInfo:
        try:
            return self._folders
        except AttributeError:
-            folders = [
-                FolderInfo(db=self._db, uuid=album)
-                for album, detail in self._db._dbalbum_details.items()
-                if not detail["intrash"]
-                and detail["kind"] == _PHOTOS_5_FOLDER_KIND
-                and detail["parentfolder"] == self._pk
-            ]
+            if self._db._db_version <= _PHOTOS_4_VERSION:
+                folders = [
+                    FolderInfo(db=self._db, uuid=folder)
+                    for folder, detail in self._db._dbfolder_details.items()
+                    if not detail["intrash"]
+                    and not detail["isMagic"]
+                    and detail["parentFolderUuid"] == self._uuid
+                ]
+            else:
+                folders = [
+                    FolderInfo(db=self._db, uuid=album)
+                    for album, detail in self._db._dbalbum_details.items()
+                    if not detail["intrash"]
+                    and detail["kind"] == _PHOTOS_5_FOLDER_KIND
+                    and detail["parentfolder"] == self._pk
+                ]
            self._folders = folders
            return self._folders

--- a/osxphotos/datetime_formatter.py
+++ b/osxphotos/datetime_formatter.py
@@ -0,0 +1,52 @@
+""" Simple formatting of datetime.datetime objects """
+
+import datetime
+
+
+class DateTimeFormatter:
+    """ provides property access to formatted datetime.datetime strftime values """
+
+    def __init__(self, dt: datetime.datetime):
+        self.dt = dt
+
+    @property
+    def date(self):
+        """ ISO date in form 2020-03-22 """
+        date = self.dt.date().isoformat()
+        return date
+
+    @property
+    def year(self):
+        """ 4 digit year """
+        year = f"{self.dt.year}"
+        return year
+
+    @property
+    def yy(self):
+        """ 2 digit year """
+        yy = f"{self.dt.strftime('%y')}"
+        return yy
+
+    @property
+    def mm(self):
+        """ 2 digit month """
+        mm = f"{self.dt.strftime('%m')}"
+        return mm
+
+    @property
+    def month(self):
+        """ Month as locale's full name """
+        month = f"{self.dt.strftime('%B')}"
+        return month
+
+    @property
+    def mon(self):
+        """ Month as locale's abbreviated name """
+        mon = f"{self.dt.strftime('%b')}"
+        return mon
+
+    @property
+    def doy(self):
+        """ Julian day of year starting from 001 """
+        doy = f"{self.dt.strftime('%j')}"
+        return doy
--- a/osxphotos/exiftool.py
+++ b/osxphotos/exiftool.py
@@ -10,7 +10,7 @@ import logging
 import os
 import subprocess
 import sys
-from functools import lru_cache # pylint: disable=syntax-error
+from functools import lru_cache  # pylint: disable=syntax-error

 from .utils import _debug

@@ -232,20 +232,27 @@ class ExifTool:
        ver = self.run_commands("-ver", no_file=True)
        return ver.decode("utf-8")

-    def json(self):
-        """ return JSON dictionary from exiftool as dict """
+    def as_dict(self):
+        """ return dictionary of all EXIF tags and values from exiftool 
+            returns empty dict if no tags
+        """
        json_str = self.run_commands("-json")
        if json_str:
-            return json.loads(json_str)
+            exifdict = json.loads(json_str)
+            return exifdict[0]
        else:
-            return None
+            return dict()
+
+    def json(self):
+        """ returns JSON string containing all EXIF tags and values from exiftool """
+        json_str = self.run_commands("-json")
+        return json_str

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

    def __str__(self):
        str_ = f"file: {self.file}\nexiftool: {self._exiftoolproc._exiftool}"
        return str_
-
--- a/osxphotos/photoinfo/init.py
+++ b/osxphotos/photoinfo/init.py
@@ -0,0 +1,8 @@
+"""
+PhotoInfo class
+Represents a single photo in the Photos library and provides access to the photo's attributes
+PhotosDB.photos() returns a list of PhotoInfo objects
+"""
+
+from .photoinfo import PhotoInfo
+from ._photoinfo_exifinfo import ExifInfo
--- a/osxphotos/photoinfo/_photoinfo_exifinfo.py
+++ b/osxphotos/photoinfo/_photoinfo_exifinfo.py
@@ -0,0 +1,94 @@
+""" PhotoInfo methods to expose EXIF info from the library """
+
+import logging
+from dataclasses import dataclass
+
+from .._constants import _PHOTOS_4_VERSION
+
+
+@dataclass(frozen=True)
+class ExifInfo:
+    """ EXIF info associated with a photo from the Photos library """
+
+    flash_fired: bool
+    iso: int
+    metering_mode: int
+    sample_rate: int
+    track_format: int
+    white_balance: int
+    aperture: float
+    bit_rate: float
+    duration: float
+    exposure_bias: float
+    focal_length: float
+    fps: float
+    latitude: float
+    longitude: float
+    shutter_speed: float
+    camera_make: str
+    camera_model: str
+    codec: str
+    lens_model: str
+
+
+@property
+def exif_info(self):
+    """ Returns an ExifInfo object with the EXIF data for photo
+        Note: the returned EXIF data is the data Photos stores in the database on import;
+        ExifInfo does not provide access to the EXIF info in the actual image file
+        Some or all of the fields may be None
+        Only valid for Photos 5; on earlier database returns None
+        """
+
+    if self._db._db_version <= _PHOTOS_4_VERSION:
+        logging.debug(f"exif_info not implemented for this database version")
+        return None
+
+    try:
+        exif = self._db._db_exifinfo_uuid[self.uuid]
+        exif_info = ExifInfo(
+            iso=exif["ZISO"],
+            flash_fired=True if exif["ZFLASHFIRED"] == 1 else False,
+            metering_mode=exif["ZMETERINGMODE"],
+            sample_rate=exif["ZSAMPLERATE"],
+            track_format=exif["ZTRACKFORMAT"],
+            white_balance=exif["ZWHITEBALANCE"],
+            aperture=exif["ZAPERTURE"],
+            bit_rate=exif["ZBITRATE"],
+            duration=exif["ZDURATION"],
+            exposure_bias=exif["ZEXPOSUREBIAS"],
+            focal_length=exif["ZFOCALLENGTH"],
+            fps=exif["ZFPS"],
+            latitude=exif["ZLATITUDE"],
+            longitude=exif["ZLONGITUDE"],
+            shutter_speed=exif["ZSHUTTERSPEED"],
+            camera_make=exif["ZCAMERAMAKE"],
+            camera_model=exif["ZCAMERAMODEL"],
+            codec=exif["ZCODEC"],
+            lens_model=exif["ZLENSMODEL"],
+        )
+    except KeyError:
+        logging.debug(f"Could not find exif record for uuid {self.uuid}")
+        exif_info = ExifInfo(
+            iso=None,
+            flash_fired=None,
+            metering_mode=None,
+            sample_rate=None,
+            track_format=None,
+            white_balance=None,
+            aperture=None,
+            bit_rate=None,
+            duration=None,
+            exposure_bias=None,
+            focal_length=None,
+            fps=None,
+            latitude=None,
+            longitude=None,
+            shutter_speed=None,
+            camera_make=None,
+            camera_model=None,
+            codec=None,
+            lens_model=None,
+        )
+
+    return exif_info
--- a/osxphotos/photoinfo/_photoinfo_exiftool.py
+++ b/osxphotos/photoinfo/_photoinfo_exiftool.py
@@ -0,0 +1,33 @@
+""" Implementation for PhotoInfo.exiftool property which returns ExifTool object for a photo """
+
+import logging
+import os
+
+from ..exiftool import ExifTool, get_exiftool_path
+
+@property
+def exiftool(self):
+    """ Returns an ExifTool object for the photo
+        requires that exiftool (https://exiftool.org/) be installed
+        If exiftool not installed, logs warning and returns None
+        If photo path is missing, returns None
+    """
+    try:
+        # return the memoized instance if it exists
+        return self._exiftool
+    except AttributeError:
+        try:
+            exiftool_path = get_exiftool_path()
+            if self.path is not None and os.path.isfile(self.path):
+                exiftool = ExifTool(self.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
+            logging.warning(f"exiftool not in path; download and install from https://exiftool.org/")
+
+        self._exiftool = exiftool
+        return self._exiftool
+
--- a/osxphotos/photoinfo/_photoinfo_searchinfo.py
+++ b/osxphotos/photoinfo/_photoinfo_searchinfo.py
@@ -0,0 +1,93 @@
+""" Methods and class for PhotoInfo exposing SearchInfo data such as labels 
+    Adds the following properties to PhotoInfo (valid only for Photos 5):
+        search_info: returns a SearchInfo object
+        labels: returns list of labels
+        labels_normalized: returns list of normalized labels
+"""
+
+from .._constants import _PHOTOS_4_VERSION, SEARCH_CATEGORY_LABEL
+
+
+@property
+def search_info(self):
+    """ returns SearchInfo object for photo 
+        only valid on Photos 5, on older libraries, returns None
+    """
+    if self._db._db_version <= _PHOTOS_4_VERSION:
+        return None
+
+    # memoize SearchInfo object
+    try:
+        return self._search_info
+    except AttributeError:
+        self._search_info = SearchInfo(self)
+        return self._search_info
+
+
+@property
+def labels(self):
+    """ returns list of labels applied to photo by Photos image categorization
+        only valid on Photos 5, on older libraries returns empty list 
+    """
+    if self._db._db_version <= _PHOTOS_4_VERSION:
+        return []
+
+    return self.search_info.labels
+
+
+@property
+def labels_normalized(self):
+    """ returns normalized list of labels applied to photo by Photos image categorization
+        only valid on Photos 5, on older libraries returns empty list 
+    """
+    if self._db._db_version <= _PHOTOS_4_VERSION:
+        return []
+
+    return self.search_info.labels_normalized
+
+
+class SearchInfo:
+    """ Info about search terms such as machine learning labels that Photos knows about a photo """
+
+    def __init__(self, photo):
+        """ photo: PhotoInfo object """
+
+        if photo._db._db_version <= _PHOTOS_4_VERSION:
+            raise NotImplementedError(
+                f"search info not implemented for this database version"
+            )
+
+        self._photo = photo
+        self.uuid = photo.uuid
+        try:
+            # get search info for this UUID
+            # there might not be any search info data (e.g. if Photo was missing or photoanalysisd not run yet)
+            self._db_searchinfo = photo._db._db_searchinfo_uuid[self.uuid]
+        except KeyError:
+            self._db_searchinfo = None
+
+    @property
+    def labels(self):
+        """ return list of labels associated with Photo """
+        if self._db_searchinfo:
+            labels = [
+                rec["content_string"]
+                for rec in self._db_searchinfo
+                if rec["category"] == SEARCH_CATEGORY_LABEL
+            ]
+        else:
+            labels = []
+        return labels
+
+    @property
+    def labels_normalized(self):
+        """ return list of normalized labels associated with Photo """
+        if self._db_searchinfo:
+            labels = [
+                rec["normalized_string"]
+                for rec in self._db_searchinfo
+                if rec["category"] == SEARCH_CATEGORY_LABEL
+            ]
+        else:
+            labels = []
+        return labels
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -7,6 +7,7 @@ PhotosDB.photos() returns a list of PhotoInfo objects
 import glob
 import json
 import logging
+import os
 import os.path
 import pathlib
 import re
@@ -18,22 +19,35 @@ from pprint import pformat
 import yaml
 from mako.template import Template

-from ._constants import (
+
+from .._constants import (
+    _MAX_IPTC_KEYWORD_LEN,
    _MOVIE_TYPE,
+    _OSXPHOTOS_NONE_SENTINEL,
    _PHOTO_TYPE,
+    _PHOTOS_4_VERSION,
    _PHOTOS_5_SHARED_PHOTO_PATH,
-    _PHOTOS_5_VERSION,
    _TEMPLATE_DIR,
+    _UNKNOWN_PERSON,
    _XMP_TEMPLATE_NAME,
 )
-from .exiftool import ExifTool
-from .placeinfo import PlaceInfo4, PlaceInfo5
-from .albuminfo import AlbumInfo
-from .utils import (
+from ..albuminfo import AlbumInfo
+from ..datetime_formatter import DateTimeFormatter
+from ..exiftool import ExifTool
+from ..placeinfo import PlaceInfo4, PlaceInfo5
+from ..template import (
+    MULTI_VALUE_SUBSTITUTIONS,
+    TEMPLATE_SUBSTITUTIONS,
+    TEMPLATE_SUBSTITUTIONS_MULTI_VALUED,
+)
+from ..utils import (
+    _hardlink_file,
    _copy_file,
    _export_photo_uuid_applescript,
    _get_resource_loc,
    dd_to_dms_str,
+    findfiles,
+    get_preferred_uti_extension,
 )


@@ -43,6 +57,16 @@ class PhotoInfo:
    including keywords, persons, albums, uuid, path, etc.
    """

+    # import additional methods
+    from ._photoinfo_searchinfo import (
+        search_info,
+        labels,
+        labels_normalized,
+        SearchInfo,
+    )
+    from ._photoinfo_exifinfo import exif_info, ExifInfo
+    from ._photoinfo_exiftool import exiftool
+
    def __init__(self, db=None, uuid=None, info=None):
        self._uuid = uuid
        self._info = info
@@ -51,7 +75,12 @@ class PhotoInfo:
    @property
    def filename(self):
        """ filename of the picture """
-        return self._info["filename"]
+        if self.has_raw and self.raw_original:
+            # return name of the RAW file
+            # TODO: not yet implemented
+            return self._info["filename"]
+        else:
+            return self._info["filename"]

    @property
    def original_filename(self):
@@ -96,7 +125,7 @@ class PhotoInfo:
        if self._info["isMissing"] == 1:
            return photopath  # path would be meaningless until downloaded

-        if self._db._db_version < _PHOTOS_5_VERSION:
+        if self._db._db_version <= _PHOTOS_4_VERSION:
            vol = self._info["volume"]
            if vol is not None:
                photopath = os.path.join("/Volumes", vol, self._info["imagePath"])
@@ -135,7 +164,7 @@ class PhotoInfo:

        photopath = None

-        if self._db._db_version < _PHOTOS_5_VERSION:
+        if self._db._db_version <= _PHOTOS_4_VERSION:
            if self._info["hasAdjustments"]:
                edit_id = self._info["edit_resource_id"]
                if edit_id is not None:
@@ -239,6 +268,76 @@ class PhotoInfo:

        return photopath

+    @property
+    def path_raw(self):
+        """ absolute path of associated RAW image or None if there is not one """
+
+        # In Photos 5, raw is in same folder as original but with _4.ext
+        # Unless "Copy Items to the Photos Library" is not checked
+        # then RAW image is not renamed but has same name is jpeg buth with raw extension
+        # Current implementation uses findfiles to find images with the correct raw UTI extension
+        # in same folder as the original and with same stem as original in form: original_stem*.raw_ext
+        # TODO: I don't like this -- would prefer a more deterministic approach but until I have more
+        # data on how Photos stores and retrieves RAW images, this seems to be working
+
+        if self._info["isMissing"] == 1:
+            return None  # path would be meaningless until downloaded
+
+        if not self.has_raw:
+            return None  # no raw image to get path for
+
+        # if self._info["shared"]:
+        #     # shared photo
+        #     photopath = os.path.join(
+        #         self._db._library_path,
+        #         _PHOTOS_5_SHARED_PHOTO_PATH,
+        #         self._info["directory"],
+        #         self._info["filename"],
+        #     )
+        #     return photopath
+
+        if self._db._db_version <= _PHOTOS_4_VERSION:
+            vol = self._info["raw_info"]["volume"]
+            if vol is not None:
+                photopath = os.path.join(
+                    "/Volumes", vol, self._info["raw_info"]["imagePath"]
+                )
+            else:
+                photopath = os.path.join(
+                    self._db._masters_path, self._info["raw_info"]["imagePath"]
+                )
+            if not os.path.isfile(photopath):
+                logging.debug(
+                    f"MISSING PATH: RAW photo for UUID {self._uuid} should be at {photopath} but does not appear to exist"
+                )
+                photopath = None
+        else:
+            filestem = pathlib.Path(self._info["filename"]).stem
+            raw_ext = get_preferred_uti_extension(self._info["UTI_raw"])
+
+            if self._info["directory"].startswith("/"):
+                filepath = self._info["directory"]
+            else:
+                filepath = os.path.join(self._db._masters_path, self._info["directory"])
+
+            glob_str = f"{filestem}*.{raw_ext}"
+            raw_file = findfiles(glob_str, filepath)
+            if len(raw_file) != 1:
+                # Note: In Photos Version 5.0 (141.19.150), images not copied to Photos Library
+                # that are missing do not always trigger is_missing = True as happens
+                # in earlier version so it's possible for this check to fail, if so, return None
+                logging.debug(f"Error getting path to RAW file: {filepath}/{glob_str}")
+                photopath = None
+            else:
+                photopath = os.path.join(filepath, raw_file[0])
+                if not os.path.isfile(photopath):
+                    logging.debug(
+                        f"MISSING PATH: RAW photo for UUID {self._uuid} should be at {photopath} but does not appear to exist"
+                    )
+                    photopath = None
+
+        return photopath
+
    @property
    def description(self):
        """ long / extended description of picture """
@@ -329,7 +428,7 @@ class PhotoInfo:
    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 """
-        if self._db._db_version >= _PHOTOS_5_VERSION:
+        if self._db._db_version > _PHOTOS_4_VERSION:
            return self._info["shared"]
        else:
            return None
@@ -341,6 +440,14 @@ class PhotoInfo:
        """
        return self._info["UTI"]

+    @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
+        """
+        return self._info["UTI_raw"]
+
    @property
    def ismovie(self):
        """ Returns True if file is a movie, otherwise False
@@ -366,7 +473,7 @@ class PhotoInfo:
        """ Returns True if photo is a cloud asset (in an iCloud library),
            otherwise False 
        """
-        if self._db._db_version < _PHOTOS_5_VERSION:
+        if self._db._db_version <= _PHOTOS_4_VERSION:
            return (
                True
                if self._info["cloudLibraryState"] is not None
@@ -409,7 +516,7 @@ class PhotoInfo:
            If photo is missing, returns None """

        photopath = None
-        if self._db._db_version < _PHOTOS_5_VERSION:
+        if self._db._db_version <= _PHOTOS_4_VERSION:
            if self.live_photo and not self.ismissing:
                live_model_id = self._info["live_model_id"]
                if live_model_id == None:
@@ -500,7 +607,7 @@ class PhotoInfo:
        # implementation note: doesn't create the PlaceInfo object until requested
        # then memoizes the object in self._place to avoid recreating the object

-        if self._db._db_version < _PHOTOS_5_VERSION:
+        if self._db._db_version <= _PHOTOS_4_VERSION:
            try:
                return self._place  # pylint: disable=access-member-before-definition
            except AttributeError:
@@ -521,12 +628,26 @@ class PhotoInfo:
                    self._place = None
                return self._place

+    @property
+    def has_raw(self):
+        """ returns True if photo has an associated RAW image, otherwise False """
+        return self._info["has_raw"]
+
+    @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 """
+        return self._info["raw_is_original"]
+
    def export(
        self,
        dest,
        *filename,
        edited=False,
        live_photo=False,
+        raw_photo=False,
+        export_as_hardlink=False,
        overwrite=False,
        increment=True,
        sidecar_json=False,
@@ -535,6 +656,9 @@ class PhotoInfo:
        timeout=120,
        exiftool=False,
        no_xattr=False,
+        use_albums_as_keywords=False,
+        use_persons_as_keywords=False,
+        keyword_template=None,
    ):
        """ export photo 
            dest: must be valid destination path (or exception raised) 
@@ -548,6 +672,8 @@ class PhotoInfo:
            edited: (boolean, default=False); if True will export the edited version of the photo 
                    (or raise exception if no edited version) 
            live_photo: (boolean, default=False); if True, will also export the associted .mov for live photos
+            raw_photo: (boolean, default=False); if True, will also export the associted RAW photo
+            export_as_hardlink: (boolean, default=False); if True, will hardlink files instead of copying them
            overwrite: (boolean, default=False); if True will overwrite files if they alreay exist 
            increment: (boolean, default=True); if True, will increment file name until a non-existant name is found 
                       if overwrite=False and increment=False, export will fail if destination file already exists 
@@ -559,7 +685,13 @@ class PhotoInfo:
            timeout: (int, default=120) timeout in seconds used with use_photos_export
            exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
            no_xattr: (boolean, default = False); if True, exports file without preserving extended attributes
-            returns list of full paths to the exported files """
+            returns list of full paths to the exported files
+            use_albums_as_keywords: (boolean, default = False); if True, will include album names in keywords
+            when exporting metadata with exiftool or sidecar
+            use_persons_as_keywords: (boolean, default = False); if True, will include person names in keywords
+            when exporting metadata with exiftool or sidecar
+            keyword_template: (list of strings); list of template strings that will be rendered as used as keywords
+             """

        # list of all files exported during this call to export
        exported_files = []
@@ -624,7 +756,10 @@ class PhotoInfo:
        # warn if suffixes don't match but ignore .JPG / .jpeg as
        # Photo's often converts .JPG to .jpeg
        suffixes = sorted([x.lower() for x in [dest.suffix, actual_suffix]])
-        if dest.suffix != actual_suffix and suffixes != [".jpeg", ".jpg"]:
+        if dest.suffix.lower() != actual_suffix.lower() and suffixes != [
+            ".jpeg",
+            ".jpg",
+        ]:
            logging.warning(
                f"Invalid destination suffix: {dest.suffix}, should be {actual_suffix}"
            )
@@ -681,7 +816,10 @@ class PhotoInfo:
            )

            # copy the file, _copy_file uses ditto to preserve Mac extended attributes
-            _copy_file(src, dest, norsrc=no_xattr)
+            if export_as_hardlink:
+                _hardlink_file(src, dest)
+            else:
+                _copy_file(src, dest, norsrc=no_xattr)
            exported_files.append(str(dest))

            # copy live photo associated .mov if requested
@@ -693,10 +831,30 @@ class PhotoInfo:
                    logging.debug(
                        f"Exporting live photo video of {filename} as {live_name.name}"
                    )
-                    _copy_file(src_live, str(live_name), norsrc=no_xattr)
+                    if export_as_hardlink:
+                        _hardlink_file(src_live, str(live_name))
+                    else:
+                        _copy_file(src_live, str(live_name), norsrc=no_xattr)
                    exported_files.append(str(live_name))
                else:
                    logging.warning(f"Skipping missing live movie for {filename}")
+
+            # copy associated RAW image if requested
+            if raw_photo and self.has_raw:
+                raw_path = pathlib.Path(self.path_raw)
+                raw_ext = raw_path.suffix
+                raw_name = dest.parent / f"{dest.stem}{raw_ext}"
+                if raw_path is not None:
+                    logging.debug(
+                        f"Exporting RAW photo of {filename} as {raw_name.name}"
+                    )
+                    if export_as_hardlink:
+                        _hardlink_file(str(raw_path), str(raw_name))
+                    else:
+                        _copy_file(str(raw_path), str(raw_name), norsrc=no_xattr)
+                    exported_files.append(str(raw_name))
+                else:
+                    logging.warning(f"Skipping missing RAW photo for {filename}")
        else:
            # use_photo_export
            exported = None
@@ -746,7 +904,11 @@ class PhotoInfo:
        if sidecar_json:
            logging.debug("writing exiftool_json_sidecar")
            sidecar_filename = dest.parent / pathlib.Path(f"{dest.stem}.json")
-            sidecar_str = self._exiftool_json_sidecar()
+            sidecar_str = self._exiftool_json_sidecar(
+                use_albums_as_keywords=use_albums_as_keywords,
+                use_persons_as_keywords=use_persons_as_keywords,
+                keyword_template=keyword_template,
+            )
            try:
                self._write_sidecar(sidecar_filename, sidecar_str)
            except Exception as e:
@@ -756,7 +918,11 @@ class PhotoInfo:
        if sidecar_xmp:
            logging.debug("writing xmp_sidecar")
            sidecar_filename = dest.parent / pathlib.Path(f"{dest.stem}.xmp")
-            sidecar_str = self._xmp_sidecar()
+            sidecar_str = self._xmp_sidecar(
+                use_albums_as_keywords=use_albums_as_keywords,
+                use_persons_as_keywords=use_persons_as_keywords,
+                keyword_template=keyword_template,
+            )
            try:
                self._write_sidecar(sidecar_filename, sidecar_str)
            except Exception as e:
@@ -766,17 +932,367 @@ class PhotoInfo:
        # if exiftool, write the metadata
        if exiftool and exported_files:
            for exported_file in exported_files:
-                self._write_exif_data(exported_file)
+                self._write_exif_data(
+                    exported_file,
+                    use_albums_as_keywords=use_albums_as_keywords,
+                    use_persons_as_keywords=use_persons_as_keywords,
+                    keyword_template=keyword_template,
+                )

        return exported_files

-    def _write_exif_data(self, filepath):
+    def render_template(self, template, none_str="_", path_sep=None):
+        """ render a filename or directory template 
+            template: str template 
+            none_str: str to use default for None values, default is '_' 
+            path_sep: optional character to use as path separator, default is os.path.sep """
+
+        if path_sep is None:
+            path_sep = os.path.sep
+        elif path_sep is not None and len(path_sep) != 1:
+            raise ValueError(f"path_sep must be single character: {path_sep}")
+
+        # the rendering happens in two phases:
+        # phase 1: handle all the single-value template substitutions
+        #          results in a single string with all the template fields replaced
+        # phase 2: loop through all the multi-value template substitutions
+        #          could result in multiple strings
+        #          e.g. if template is "{album}/{person}" and there are 2 albums and 3 persons in the photo
+        #          there would be 6 possible renderings (2 albums x 3 persons)
+
+        # regex to find {template_field,optional_default} in strings
+        # for explanation of regex see https://regex101.com/r/4JJg42/1
+        # pylint: disable=anomalous-backslash-in-string
+        regex = r"(?<!\{)\{([^\\,}]+)(,{0,1}(([\w\-. ]+))?)(?=\}(?!\}))\}"
+
+        if type(template) is not str:
+            raise TypeError(f"template must be type str, not {type(template)}")
+
+        def make_subst_function(self, none_str, get_func=self.get_template_value):
+            """ returns: substitution function for use in re.sub 
+                photo: a PhotoInfo object
+                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
+                        default is get_template_value which handles the single-value fields """
+
+            # closure to capture photo, none_str in subst
+            def subst(matchobj):
+                groups = len(matchobj.groups())
+                if groups == 4:
+                    try:
+                        val = get_func(matchobj.group(1))
+                    except KeyError:
+                        return matchobj.group(0)
+
+                    if val is None:
+                        return (
+                            matchobj.group(3)
+                            if matchobj.group(3) is not None
+                            else none_str
+                        )
+                    else:
+                        return val
+                else:
+                    raise ValueError(
+                        f"Unexpected number of groups: expected 4, got {groups}"
+                    )
+
+            return subst
+
+        subst_func = make_subst_function(self, none_str)
+
+        # do the replacements
+        rendered = re.sub(regex, subst_func, template)
+
+        # do multi-valued placements
+        # start with the single string from phase 1 above then loop through all
+        # multi-valued fields and all values for each of those fields
+        # rendered_strings will be updated as each field is processed
+        # for example: if two albums, two keywords, and one person and template is:
+        # "{created.year}/{album}/{keyword}/{person}"
+        # rendered strings would do the following:
+        # start (created.year filled in phase 1)
+        #   ['2011/{album}/{keyword}/{person}']
+        # after processing albums:
+        #   ['2011/Album1/{keyword}/{person}',
+        #    '2011/Album2/{keyword}/{person}',]
+        # after processing keywords:
+        #   ['2011/Album1/keyword1/{person}',
+        #    '2011/Album1/keyword2/{person}',
+        #    '2011/Album2/keyword1/{person}',
+        #    '2011/Album2/keyword2/{person}',]
+        # after processing person:
+        #   ['2011/Album1/keyword1/person1',
+        #    '2011/Album1/keyword2/person1',
+        #    '2011/Album2/keyword1/person1',
+        #    '2011/Album2/keyword2/person1',]
+
+        rendered_strings = set([rendered])
+        for field in MULTI_VALUE_SUBSTITUTIONS:
+            if field == "album":
+                values = self.albums
+            elif field == "keyword":
+                values = self.keywords
+            elif field == "person":
+                values = self.persons
+                # remove any _UNKNOWN_PERSON values
+                values = [val for val in values if val != _UNKNOWN_PERSON]
+            elif field == "folder_album":
+                values = []
+                # photos must be in an album to be in a folder
+                for album in self.album_info:
+                    if album.folder_names:
+                        # album in folder
+                        folder = path_sep.join(album.folder_names)
+                        folder += path_sep + album.title
+                        values.append(folder)
+                    else:
+                        # album not in folder
+                        values.append(album.title)
+
+            else:
+                raise ValueError(f"Unhandleded template value: {field}")
+
+            # If no values, insert None so code below will substite none_str for None
+            values = values or [None]
+
+            # Build a regex that matches only the field being processed
+            re_str = r"(?<!\\)\{(" + field + r")(,{0,1}(([\w\-. ]+))?)\}"
+            regex_multi = re.compile(re_str)
+
+            # holds each of the new rendered_strings, set() to avoid duplicates
+            new_strings = set()
+
+            for str_template in rendered_strings:
+                for val in values:
+
+                    def get_template_value_multi(lookup_value):
+                        """ 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 """
+                        if lookup_value == field:
+                            return val
+                        else:
+                            raise KeyError(f"Unexpected value: {lookup_value}")
+
+                    subst = make_subst_function(
+                        self, none_str, get_func=get_template_value_multi
+                    )
+                    new_string = regex_multi.sub(subst, str_template)
+                    new_strings.add(new_string)
+
+            # update rendered_strings for the next field to process
+            rendered_strings = new_strings
+
+        # find any {fields} that weren't replaced
+        unmatched = []
+        for rendered_str in rendered_strings:
+            unmatched.extend(
+                [
+                    no_match[0]
+                    for no_match in re.findall(regex, rendered_str)
+                    if no_match[0] not in unmatched
+                ]
+            )
+
+        # fix any escaped curly braces
+        rendered_strings = [
+            rendered_str.replace("{{", "{").replace("}}", "}")
+            for rendered_str in rendered_strings
+        ]
+
+        return rendered_strings, unmatched
+
+    def get_template_value(self, lookup):
+        """ lookup template value (single-value template substitutions) for use in make_subst_function
+            lookup: value to find a match for
+            returns: either the matching template value (which may be None)
+            raises: KeyError if no rule exists for lookup """
+
+        # must be a valid keyword
+        if lookup == "name":
+            return pathlib.Path(self.filename).stem
+
+        if lookup == "original_name":
+            return pathlib.Path(self.original_filename).stem
+
+        if lookup == "title":
+            return self.title
+
+        if lookup == "descr":
+            return self.description
+
+        if lookup == "created.date":
+            return DateTimeFormatter(self.date).date
+
+        if lookup == "created.year":
+            return DateTimeFormatter(self.date).year
+
+        if lookup == "created.yy":
+            return DateTimeFormatter(self.date).yy
+
+        if lookup == "created.mm":
+            return DateTimeFormatter(self.date).mm
+
+        if lookup == "created.month":
+            return DateTimeFormatter(self.date).month
+
+        if lookup == "created.mon":
+            return DateTimeFormatter(self.date).mon
+
+        if lookup == "created.doy":
+            return DateTimeFormatter(self.date).doy
+
+        if lookup == "modified.date":
+            return (
+                DateTimeFormatter(self.date_modified).date
+                if self.date_modified
+                else None
+            )
+
+        if lookup == "modified.year":
+            return (
+                DateTimeFormatter(self.date_modified).year
+                if self.date_modified
+                else None
+            )
+
+        if lookup == "modified.yy":
+            return (
+                DateTimeFormatter(self.date_modified).yy if self.date_modified else None
+            )
+
+        if lookup == "modified.mm":
+            return (
+                DateTimeFormatter(self.date_modified).mm if self.date_modified else None
+            )
+
+        if lookup == "modified.month":
+            return (
+                DateTimeFormatter(self.date_modified).month
+                if self.date_modified
+                else None
+            )
+
+        if lookup == "modified.mon":
+            return (
+                DateTimeFormatter(self.date_modified).mon
+                if self.date_modified
+                else None
+            )
+
+        if lookup == "modified.doy":
+            return (
+                DateTimeFormatter(self.date_modified).doy
+                if self.date_modified
+                else None
+            )
+
+        if lookup == "place.name":
+            return self.place.name if self.place else None
+
+        if lookup == "place.country_code":
+            return self.place.country_code if self.place else None
+
+        if lookup == "place.name.country":
+            return (
+                self.place.names.country[0]
+                if self.place and self.place.names.country
+                else None
+            )
+
+        if lookup == "place.name.state_province":
+            return (
+                self.place.names.state_province[0]
+                if self.place and self.place.names.state_province
+                else None
+            )
+
+        if lookup == "place.name.city":
+            return (
+                self.place.names.city[0]
+                if self.place and self.place.names.city
+                else None
+            )
+
+        if lookup == "place.name.area_of_interest":
+            return (
+                self.place.names.area_of_interest[0]
+                if self.place and self.place.names.area_of_interest
+                else None
+            )
+
+        if lookup == "place.address":
+            return (
+                self.place.address_str
+                if self.place and self.place.address_str
+                else None
+            )
+
+        if lookup == "place.address.street":
+            return (
+                self.place.address.street
+                if self.place and self.place.address.street
+                else None
+            )
+
+        if lookup == "place.address.city":
+            return (
+                self.place.address.city
+                if self.place and self.place.address.city
+                else None
+            )
+
+        if lookup == "place.address.state_province":
+            return (
+                self.place.address.state_province
+                if self.place and self.place.address.state_province
+                else None
+            )
+
+        if lookup == "place.address.postal_code":
+            return (
+                self.place.address.postal_code
+                if self.place and self.place.address.postal_code
+                else None
+            )
+
+        if lookup == "place.address.country":
+            return (
+                self.place.address.country
+                if self.place and self.place.address.country
+                else None
+            )
+
+        if lookup == "place.address.country_code":
+            return (
+                self.place.address.iso_country_code
+                if self.place and self.place.address.iso_country_code
+                else None
+            )
+
+        # if here, didn't get a match
+        raise KeyError(f"No rule for processing {lookup}")
+
+    def _write_exif_data(
+        self,
+        filepath,
+        use_albums_as_keywords=False,
+        use_persons_as_keywords=False,
+        keyword_template=None,
+    ):
        """ write exif data to image file at filepath
        filepath: full path to the image file """
        if not os.path.exists(filepath):
            raise FileNotFoundError(f"Could not find file {filepath}")
        exiftool = ExifTool(filepath)
-        exif_info = json.loads(self._exiftool_json_sidecar())[0]
+        exif_info = json.loads(
+            self._exiftool_json_sidecar(
+                use_albums_as_keywords=use_albums_as_keywords,
+                use_persons_as_keywords=use_persons_as_keywords,
+                keyword_template=keyword_template,
+            )
+        )[0]
        for exiftag, val in exif_info.items():
            if type(val) == list:
                # more than one, set first value the add additional values
@@ -787,16 +1303,24 @@ class PhotoInfo:
            else:
                exiftool.setvalue(exiftag, val)

-    def _exiftool_json_sidecar(self):
+    def _exiftool_json_sidecar(
+        self,
+        use_albums_as_keywords=False,
+        use_persons_as_keywords=False,
+        keyword_template=None,
+    ):
        """ return json string of EXIF details in exiftool sidecar format
            Does not include all the EXIF fields as those are likely already in the image
+            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
            Exports the following:
                FileName
                ImageDescription
                Description
                Title
                TagsList
-                Keywords
+                Keywords (may include album name, person name, or template)
                Subject
                PersonInImage
                GPSLatitude, GPSLongitude
@@ -816,18 +1340,64 @@ class PhotoInfo:
        if self.title:
            exif["XMP:Title"] = self.title

+        keyword_list = []
        if self.keywords:
-            exif["XMP:TagsList"] = exif["IPTC:Keywords"] = list(self.keywords)
-            # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-            exif["XMP:Subject"] = list(self.keywords)
+            keyword_list.extend(self.keywords)

+        person_list = []
        if self.persons:
-            exif["XMP:PersonInImage"] = self.persons
+            # filter out _UNKNOWN_PERSON
+            person_list = [p for p in self.persons if p != _UNKNOWN_PERSON]
+
+        if use_persons_as_keywords and person_list:
+            keyword_list.extend(person_list)
+
+        if use_albums_as_keywords and self.albums:
+            keyword_list.extend(self.albums)
+
+        if keyword_template:
+            rendered_keywords = []
+            for template_str in keyword_template:
+                rendered, unmatched = self.render_template(
+                    template_str, none_str=_OSXPHOTOS_NONE_SENTINEL, path_sep="/"
+                )
+                if unmatched:
+                    logging.warning(
+                        f"Unmatched template substitution for template: {template_str} {unmatched}"
+                    )
+                rendered_keywords.extend(rendered)
+
+            # filter out any template values that didn't match by looking for sentinel
+            rendered_keywords = [
+                keyword
+                for keyword in rendered_keywords
+                if _OSXPHOTOS_NONE_SENTINEL not in keyword
+            ]
+
+            # check to see if any keywords too long
+            long_keywords = [
+                long_str
+                for long_str in rendered_keywords
+                if len(long_str) > _MAX_IPTC_KEYWORD_LEN
+            ]
+            if long_keywords:
+                logging.warning(
+                    f"Some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN}: {long_keywords}"
+                )
+
+            logging.debug(f"rendered_keywords: {rendered_keywords}")
+            keyword_list.extend(rendered_keywords)
+
+        if keyword_list:
+            exif["XMP:TagsList"] = exif["IPTC:Keywords"] = keyword_list
+
+        if person_list:
+            exif["XMP:PersonInImage"] = person_list
+
+        if self.keywords or person_list:
            # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
-            if "XMP:Subject" in exif:
-                exif["XMP:Subject"].extend(self.persons)
-            else:
-                exif["XMP:Subject"] = self.persons
+            # only use Photos' keywords for subject
+            exif["XMP:Subject"] = list(self.keywords) + person_list

        # if self.favorite():
        #     exif["Rating"] = 5
@@ -861,14 +1431,86 @@ class PhotoInfo:
        json_str = json.dumps([exif])
        return json_str

-    def _xmp_sidecar(self):
-        """ returns string for XMP sidecar """
+    def _xmp_sidecar(
+        self,
+        use_albums_as_keywords=False,
+        use_persons_as_keywords=False,
+        keyword_template=None,
+    ):
+        """ returns string for XMP sidecar 
+            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 """
+
        # TODO: add additional fields to XMP file?

        xmp_template = Template(
            filename=os.path.join(_TEMPLATE_DIR, _XMP_TEMPLATE_NAME)
        )
-        xmp_str = xmp_template.render(photo=self)
+
+        keyword_list = []
+        if self.keywords:
+            keyword_list.extend(self.keywords)
+
+        # TODO: keyword handling in this and _exiftool_json_sidecar is
+        # good candidate for pulling out in a function
+
+        person_list = []
+        if self.persons:
+            # filter out _UNKNOWN_PERSON
+            person_list = [p for p in self.persons if p != _UNKNOWN_PERSON]
+
+        if use_persons_as_keywords and person_list:
+            keyword_list.extend(person_list)
+
+        if use_albums_as_keywords and self.albums:
+            keyword_list.extend(self.albums)
+
+        if keyword_template:
+            rendered_keywords = []
+            for template_str in keyword_template:
+                rendered, unmatched = self.render_template(
+                    template_str, none_str=_OSXPHOTOS_NONE_SENTINEL, path_sep="/"
+                )
+                if unmatched:
+                    logging.warning(
+                        f"Unmatched template substitution for template: {template_str} {unmatched}"
+                    )
+                rendered_keywords.extend(rendered)
+
+            # filter out any template values that didn't match by looking for sentinel
+            rendered_keywords = [
+                keyword
+                for keyword in rendered_keywords
+                if _OSXPHOTOS_NONE_SENTINEL not in keyword
+            ]
+
+            # check to see if any keywords too long
+            long_keywords = [
+                long_str
+                for long_str in rendered_keywords
+                if len(long_str) > _MAX_IPTC_KEYWORD_LEN
+            ]
+            if long_keywords:
+                logging.warning(
+                    f"Some keywords exceed max IPTC Keyword length of {_MAX_IPTC_KEYWORD_LEN}: {long_keywords}"
+                )
+
+            logging.debug(f"rendered_keywords: {rendered_keywords}")
+            keyword_list.extend(rendered_keywords)
+
+        subject_list = []
+        if self.keywords or person_list:
+            # Photos puts both keywords and persons in Subject when using "Export IPTC as XMP"
+            subject_list = list(self.keywords) + person_list
+
+        xmp_str = xmp_template.render(
+            photo=self,
+            keywords=keyword_list,
+            persons=person_list,
+            subjects=subject_list,
+        )
+
        # remove extra lines that mako inserts from template
        xmp_str = "\n".join(
            [line for line in xmp_str.split("\n") if line.strip() != ""]
@@ -947,6 +1589,9 @@ class PhotoInfo:
            "hdr": self.hdr,
            "selfie": self.selfie,
            "panorama": self.panorama,
+            "has_raw": self.has_raw,
+            "uti_raw": self.uti_raw,
+            "path_raw": self.path_raw,
        }
        return yaml.dump(info, sort_keys=False)

@@ -993,6 +1638,9 @@ class PhotoInfo:
            "hdr": self.hdr,
            "selfie": self.selfie,
            "panorama": self.panorama,
+            "has_raw": self.has_raw,
+            "uti_raw": self.uti_raw,
+            "path_raw": self.path_raw,
        }
        return json.dumps(pic)

--- a/osxphotos/photosdb/init.py
+++ b/osxphotos/photosdb/init.py
@@ -0,0 +1,6 @@
+"""
+PhotosDB class
+Processes a Photos.app library database to extract information about photos
+"""
+
+from .photosdb import PhotosDB
--- a/osxphotos/photosdb/_photosdb_process_exif.py
+++ b/osxphotos/photosdb/_photosdb_process_exif.py
@@ -0,0 +1,56 @@
+""" PhotosDB method for processing exif info 
+    Do not import this module directly """
+
+import logging
+
+from .._constants import _PHOTOS_4_VERSION
+from ..utils import _db_is_locked, _debug, _open_sql_file
+
+
+def _process_exifinfo(self):
+    """ load the exif data from the database 
+        this is a PhotosDB method that should be imported in 
+        the PhotosDB class definition in photosdb.py
+    """
+    if self._db_version <= _PHOTOS_4_VERSION:
+        _process_exifinfo_4(self)
+    else:
+        _process_exifinfo_5(self)
+
+
+# The following methods do not get imported into PhotosDB
+# but will get called by _process_exifinfo
+
+
+def _process_exifinfo_4(photosdb):
+    """ process exif info for Photos <= 4 
+        photosdb: PhotosDB instance """
+    photosdb._db_exifinfo_uuid = {}
+    raise NotImplementedError(f"search info not implemented for this database version")
+
+
+def _process_exifinfo_5(photosdb):
+    """ process exif info for Photos >= 5 
+        photosdb: PhotosDB instance """
+
+    db = photosdb._tmp_db
+    
+    (conn, cursor) = _open_sql_file(db)
+
+    result = conn.execute(
+        """
+        SELECT ZGENERICASSET.ZUUID, ZEXTENDEDATTRIBUTES.*
+        FROM ZGENERICASSET
+        JOIN ZEXTENDEDATTRIBUTES
+        ON ZEXTENDEDATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK
+        """
+    )
+
+    photosdb._db_exifinfo_uuid = {}
+    cols = [c[0] for c in result.description]
+    for row in result.fetchall():
+        record = dict(zip(cols, row))
+        uuid = record["ZUUID"]
+        if uuid in photosdb._db_exifinfo_uuid:
+            logging.warning(f"duplicate exifinfo record found for uuid {uuid}")
+        photosdb._db_exifinfo_uuid[uuid] = record
--- a/osxphotos/photosdb/_photosdb_process_searchinfo.py
+++ b/osxphotos/photosdb/_photosdb_process_searchinfo.py
@@ -0,0 +1,197 @@
+""" Methods for PhotosDB to add Photos 5 search info such as machine learning labels 
+    Kudos to Simon Willison who figured out how to extract this data from psi.sql
+    ref: https://github.com/dogsheep/photos-to-sqlite/issues/16
+"""
+
+import logging
+import pathlib
+import uuid as uuidlib
+from pprint import pformat
+
+from .._constants import _PHOTOS_4_VERSION, SEARCH_CATEGORY_LABEL
+from ..utils import _db_is_locked, _debug, _open_sql_file
+
+"""
+    This module should be imported in the class defintion of PhotosDB in photosdb.py
+    Do not import this module directly
+    This module adds the following method to PhotosDB:
+        _process_searchinfo: process search terms from psi.sqlite 
+
+    The following properties are added to PhotosDB    
+        labels: list of all labels in the library
+        labels_normalized: list of all labels normalized in the library  
+        labels_as_dict: dict of {label: count of photos} in reverse sorted order (most photos first)
+        labels_normalized_as_dict: dict of {normalized label: count of photos} in reverse sorted order (most photos first)
+
+    The following data structures are added to PhotosDB
+        self._db_searchinfo_categories
+        self._db_searchinfo_uuid
+        self._db_searchinfo_labels 
+        self._db_searchinfo_labels_normalized 
+    
+    These methods only work on Photos 5 databases.  Will print warning on earlier library versions.
+"""
+
+
+def _process_searchinfo(self):
+    """ load machine learning/search term label info from a Photos library
+        db_connection: a connection to the SQLite database file containing the 
+        search terms.  In Photos 5, this is called psi.sqlite
+        Note: Only works on Photos version == 5.0 """
+
+    if self._db_version <= _PHOTOS_4_VERSION:
+        raise NotImplementedError(
+            f"search info not implemented for this database version"
+        )
+
+    search_db_path = pathlib.Path(self._dbfile).parent / "search" / "psi.sqlite"
+    if not search_db_path.exists():
+        raise FileNotFoundError(f"could not find search db: {search_db_path}")
+
+    if _db_is_locked(search_db_path):
+        search_db = self._copy_db_file(search_db_path)
+    else:
+        search_db = search_db_path
+
+    (conn, c) = _open_sql_file(search_db)
+
+    result = conn.execute(
+        """
+        select
+        ga.rowid,
+        assets.uuid_0,
+        assets.uuid_1,
+        groups.rowid as groupid,
+        groups.category,
+        groups.owning_groupid,
+        groups.content_string,
+        groups.normalized_string,
+        groups.lookup_identifier
+        from
+        ga
+        join groups on groups.rowid = ga.groupid
+        join assets on ga.assetid = assets.rowid
+        order by
+        ga.rowid
+        """
+    )
+
+    # _db_searchinfo_uuid is dict in form {uuid : [list of associated search info records]
+    _db_searchinfo_uuid = {}
+
+    # _db_searchinfo_categories is dict in form {search info category id: list normalized strings for the category
+    # right now, this is mostly for debugging to easily see which search terms are in the library
+    _db_searchinfo_categories = {}
+
+    # _db_searchinfo_labels is dict in form {normalized label: [list of photo uuids]}
+    # this serves as a reverse index from label to photos containing the label
+    # _db_searchinfo_labels_normalized is the same but with normalized (lower case) version of the label
+    _db_searchinfo_labels = {}
+    _db_searchinfo_labels_normalized = {}
+
+    cols = [c[0] for c in result.description]
+    for row in result.fetchall():
+        record = dict(zip(cols, row))
+        uuid = ints_to_uuid(record["uuid_0"], record["uuid_1"])
+        # strings have null character appended, so strip it
+        for key in record:
+            if isinstance(record[key], str):
+                record[key] = record[key].replace("\x00", "")
+        try:
+            _db_searchinfo_uuid[uuid].append(record)
+        except KeyError:
+            _db_searchinfo_uuid[uuid] = [record]
+
+        category = record["category"]
+        try:
+            _db_searchinfo_categories[record["category"]].append(
+                record["normalized_string"]
+            )
+        except KeyError:
+            _db_searchinfo_categories[record["category"]] = [
+                record["normalized_string"]
+            ]
+
+        if record["category"] == SEARCH_CATEGORY_LABEL:
+            label = record["content_string"]
+            label_norm = record["normalized_string"]
+            try:
+                _db_searchinfo_labels[label].append(uuid)
+                _db_searchinfo_labels_normalized[label_norm].append(uuid)
+            except KeyError:
+                _db_searchinfo_labels[label] = [uuid]
+                _db_searchinfo_labels_normalized[label_norm] = [uuid]
+
+    self._db_searchinfo_categories = _db_searchinfo_categories
+    self._db_searchinfo_uuid = _db_searchinfo_uuid
+    self._db_searchinfo_labels = _db_searchinfo_labels
+    self._db_searchinfo_labels_normalized = _db_searchinfo_labels_normalized
+
+    if _debug():
+        logging.debug(
+            "_db_searchinfo_categories: \n" + pformat(self._db_searchinfo_categories)
+        )
+        logging.debug("_db_searchinfo_uuid: \n" + pformat(self._db_searchinfo_uuid))
+        logging.debug("_db_searchinfo_labels: \n" + pformat(self._db_searchinfo_labels))
+        logging.debug(
+            "_db_searchinfo_labels_normalized: \n"
+            + pformat(self._db_searchinfo_labels_normalized)
+        )
+
+
+@property
+def labels(self):
+    """ return list of all search info labels found in the library """
+    if self._db_version <= _PHOTOS_4_VERSION:
+        logging.warning(f"SearchInfo not implemented for this library version")
+        return []
+
+    return list(self._db_searchinfo_labels.keys())
+
+
+@property
+def labels_normalized(self):
+    """ return list of all normalized search info labels found in the library """
+    if self._db_version <= _PHOTOS_4_VERSION:
+        logging.warning(f"SearchInfo not implemented for this library version")
+        return []
+
+    return list(self._db_searchinfo_labels_normalized.keys())
+
+
+@property
+def labels_as_dict(self):
+    """ return labels as dict of label: count in reverse sorted order (descending) """
+    if self._db_version <= _PHOTOS_4_VERSION:
+        logging.warning(f"SearchInfo not implemented for this library version")
+        return dict()
+
+    labels = {k: len(v) for k, v in self._db_searchinfo_labels.items()}
+    labels = dict(sorted(labels.items(), key=lambda kv: kv[1], reverse=True))
+    return labels
+
+
+@property
+def labels_normalized_as_dict(self):
+    """ return normalized labels as dict of label: count in reverse sorted order (descending) """
+    if self._db_version <= _PHOTOS_4_VERSION:
+        logging.warning(f"SearchInfo not implemented for this library version")
+        return dict()
+    labels = {k: len(v) for k, v in self._db_searchinfo_labels_normalized.items()}
+    labels = dict(sorted(labels.items(), key=lambda kv: kv[1], reverse=True))
+    return labels
+
+
+# The following method is not imported into PhotosDB
+
+
+def ints_to_uuid(uuid_0, uuid_1):
+    """ convert two signed ints into a UUID strings
+        uuid_0, uuid_1: the two int components of an RFC 4122 UUID """
+
+    # assumes uuid imported as uuidlib (to avoid namespace conflict with other uses of uuid)
+
+    bytes_ = uuid_0.to_bytes(8, "little", signed=True) + uuid_1.to_bytes(
+        8, "little", signed=True
+    )
+    return str(uuidlib.UUID(bytes=bytes_)).upper()
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
--- a/osxphotos/template.py
+++ b/osxphotos/template.py
@@ -1,4 +1,4 @@
-""" Custom template system for osxphotos """
+""" Custom template system for osxphotos (implemented in PhotoInfo.render_template) """

 # Rolled my own template system because:
 # 1. Needed to handle multiple values (e.g. album, keyword)
@@ -9,17 +9,14 @@
 #
 # This code isn't elegant but it seems to work well.  PRs gladly accepted.

-import datetime
-import pathlib
-import re
-from typing import Tuple, List  # pylint: disable=syntax-error
+import locale

-from .photoinfo import PhotoInfo
-from ._constants import _UNKNOWN_PERSON
+# ensure locale set to user's locale
+locale.setlocale(locale.LC_ALL, "")

 # Permitted substitutions (each of these returns a single value or None)
 TEMPLATE_SUBSTITUTIONS = {
-    "{name}": "Filename of the photo",
+    "{name}": "Current filename of the photo",
    "{original_name}": "Photo's original filename when imported to Photos",
    "{title}": "Title of the photo",
    "{descr}": "Description of the photo",
@@ -55,7 +52,7 @@ TEMPLATE_SUBSTITUTIONS = {
 # Permitted multi-value substitutions (each of these returns None or 1 or more values)
 TEMPLATE_SUBSTITUTIONS_MULTI_VALUED = {
    "{album}": "Album(s) photo is contained in",
-    # "{folder}": "Folder path + album photo is contained in. e.g. Folder/Subfolder/Album",
+    "{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",
    "{person}": "Person(s) / face(s) in a photo",
 }
@@ -65,368 +62,3 @@ MULTI_VALUE_SUBSTITUTIONS = [
    field.replace("{", "").replace("}", "")
    for field in TEMPLATE_SUBSTITUTIONS_MULTI_VALUED.keys()
 ]
-
-
-def get_template_value(lookup, photo):
-    """ lookup template value (single-value template substitutions) for use in make_subst_function
-        lookup: value to find a match for
-        photo: PhotoInfo object whose data will be used for value substitutions
-        returns: either the matching template value (which may be None)
-        raises: KeyError if no rule exists for lookup """
-
-    # must be a valid keyword
-    if lookup == "name":
-        return pathlib.Path(photo.filename).stem
-
-    if lookup == "original_name":
-        return pathlib.Path(photo.original_filename).stem
-
-    if lookup == "title":
-        return photo.title
-
-    if lookup == "descr":
-        return photo.description
-
-    if lookup == "created.date":
-        return DateTimeFormatter(photo.date).date
-
-    if lookup == "created.year":
-        return DateTimeFormatter(photo.date).year
-
-    if lookup == "created.yy":
-        return DateTimeFormatter(photo.date).yy
-
-    if lookup == "created.mm":
-        return DateTimeFormatter(photo.date).mm
-
-    if lookup == "created.month":
-        return DateTimeFormatter(photo.date).month
-
-    if lookup == "created.mon":
-        return DateTimeFormatter(photo.date).mon
-
-    if lookup == "created.doy":
-        return DateTimeFormatter(photo.date).doy
-
-    if lookup == "modified.date":
-        return (
-            DateTimeFormatter(photo.date_modified).date if photo.date_modified else None
-        )
-
-    if lookup == "modified.year":
-        return (
-            DateTimeFormatter(photo.date_modified).year if photo.date_modified else None
-        )
-
-    if lookup == "modified.yy":
-        return (
-            DateTimeFormatter(photo.date_modified).yy if photo.date_modified else None
-        )
-
-    if lookup == "modified.mm":
-        return (
-            DateTimeFormatter(photo.date_modified).mm if photo.date_modified else None
-        )
-
-    if lookup == "modified.month":
-        return (
-            DateTimeFormatter(photo.date_modified).month
-            if photo.date_modified
-            else None
-        )
-
-    if lookup == "modified.mon":
-        return (
-            DateTimeFormatter(photo.date_modified).mon if photo.date_modified else None
-        )
-
-    if lookup == "modified.doy":
-        return (
-            DateTimeFormatter(photo.date_modified).doy if photo.date_modified else None
-        )
-
-    if lookup == "place.name":
-        return photo.place.name if photo.place else None
-
-    if lookup == "place.country_code":
-        return photo.place.country_code if photo.place else None
-
-    if lookup == "place.name.country":
-        return (
-            photo.place.names.country[0]
-            if photo.place and photo.place.names.country
-            else None
-        )
-
-    if lookup == "place.name.state_province":
-        return (
-            photo.place.names.state_province[0]
-            if photo.place and photo.place.names.state_province
-            else None
-        )
-
-    if lookup == "place.name.city":
-        return (
-            photo.place.names.city[0]
-            if photo.place and photo.place.names.city
-            else None
-        )
-
-    if lookup == "place.name.area_of_interest":
-        return (
-            photo.place.names.area_of_interest[0]
-            if photo.place and photo.place.names.area_of_interest
-            else None
-        )
-
-    if lookup == "place.address":
-        return (
-            photo.place.address_str if photo.place and photo.place.address_str else None
-        )
-
-    if lookup == "place.address.street":
-        return (
-            photo.place.address.street
-            if photo.place and photo.place.address.street
-            else None
-        )
-
-    if lookup == "place.address.city":
-        return (
-            photo.place.address.city
-            if photo.place and photo.place.address.city
-            else None
-        )
-
-    if lookup == "place.address.state_province":
-        return (
-            photo.place.address.state_province
-            if photo.place and photo.place.address.state_province
-            else None
-        )
-
-    if lookup == "place.address.postal_code":
-        return (
-            photo.place.address.postal_code
-            if photo.place and photo.place.address.postal_code
-            else None
-        )
-
-    if lookup == "place.address.country":
-        return (
-            photo.place.address.country
-            if photo.place and photo.place.address.country
-            else None
-        )
-
-    if lookup == "place.address.country_code":
-        return (
-            photo.place.address.iso_country_code
-            if photo.place and photo.place.address.iso_country_code
-            else None
-        )
-
-    # if here, didn't get a match
-    raise KeyError(f"No rule for processing {lookup}")
-
-
-def render_filepath_template(template, photo, none_str="_"):
-    """ render a filename or directory template 
-        template: str template 
-        photo: PhotoInfo object
-        none_str: str to use default for None values, default is '_' """
-
-    # the rendering happens in two phases:
-    # phase 1: handle all the single-value template substitutions
-    #          results in a single string with all the template fields replaced
-    # phase 2: loop through all the multi-value template substitutions
-    #          could result in multiple strings
-    #          e.g. if template is "{album}/{person}" and there are 2 albums and 3 persons in the photo
-    #          there would be 6 possible renderings (2 albums x 3 persons)
-
-    # regex to find {template_field,optional_default} in strings
-    # for explanation of regex see https://regex101.com/r/4JJg42/1
-    # pylint: disable=anomalous-backslash-in-string
-    regex = r"(?<!\{)\{([^\\,}]+)(,{0,1}(([\w\-. ]+))?)(?=\}(?!\}))\}"
-
-    if type(template) is not str:
-        raise TypeError(f"template must be type str, not {type(template)}")
-
-    if type(photo) is not PhotoInfo:
-        raise TypeError(f"photo must be type osxphotos.PhotoInfo, not {type(photo)}")
-
-    def make_subst_function(photo, none_str, get_func=get_template_value):
-        """ returns: substitution function for use in re.sub 
-            photo: a PhotoInfo object
-            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
-                      default is get_template_value which handles the single-value fields """
-
-        # closure to capture photo, none_str in subst
-        def subst(matchobj):
-            groups = len(matchobj.groups())
-            if groups == 4:
-                try:
-                    val = get_func(matchobj.group(1), photo)
-                except KeyError:
-                    return matchobj.group(0)
-
-                if val is None:
-                    return (
-                        matchobj.group(3) if matchobj.group(3) is not None else none_str
-                    )
-                else:
-                    return val
-            else:
-                raise ValueError(
-                    f"Unexpected number of groups: expected 4, got {groups}"
-                )
-
-        return subst
-
-    subst_func = make_subst_function(photo, none_str)
-
-    # do the replacements
-    rendered = re.sub(regex, subst_func, template)
-
-    # do multi-valued placements
-    # start with the single string from phase 1 above then loop through all
-    # multi-valued fields and all values for each of those fields
-    # rendered_strings will be updated as each field is processed
-    # for example: if two albums, two keywords, and one person and template is:
-    # "{created.year}/{album}/{keyword}/{person}"
-    # rendered strings would do the following:
-    # start (created.year filled in phase 1)
-    #   ['2011/{album}/{keyword}/{person}']
-    # after processing albums:
-    #   ['2011/Album1/{keyword}/{person}',
-    #    '2011/Album2/{keyword}/{person}',]
-    # after processing keywords:
-    #   ['2011/Album1/keyword1/{person}',
-    #    '2011/Album1/keyword2/{person}',
-    #    '2011/Album2/keyword1/{person}',
-    #    '2011/Album2/keyword2/{person}',]
-    # after processing person:
-    #   ['2011/Album1/keyword1/person1',
-    #    '2011/Album1/keyword2/person1',
-    #    '2011/Album2/keyword1/person1',
-    #    '2011/Album2/keyword2/person1',]
-
-    rendered_strings = set([rendered])
-    for field in MULTI_VALUE_SUBSTITUTIONS:
-        if field == "album":
-            values = photo.albums
-        elif field == "keyword":
-            values = photo.keywords
-        elif field == "person":
-            values = photo.persons
-            # remove any _UNKNOWN_PERSON values
-            values = [val for val in values if val != _UNKNOWN_PERSON]
-        # elif field == "folder":
-        #     folders = []
-        #     # photos must be in an album to be in a folder
-        #     albums = photo.albums
-        #     for album in albums:
-        #         zzz
-
-        else:
-            raise ValueError(f"Unhandleded template value: {field}")
-
-        # If no values, insert None so code below will substite none_str for None
-        values = values or [None]
-
-        # Build a regex that matches only the field being processed
-        re_str = r"(?<!\\)\{(" + field + r")(,{0,1}(([\w\-. ]+))?)\}"
-        regex_multi = re.compile(re_str)
-
-        # holds each of the new rendered_strings, set() to avoid duplicates
-        new_strings = set()
-
-        for str_template in rendered_strings:
-            for val in values:
-
-                def get_template_value_multi(lookup_value, photo):
-                    """ 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 """
-                    if lookup_value == field:
-                        return val
-                    else:
-                        raise KeyError(f"Unexpected value: {lookup_value}")
-
-                subst = make_subst_function(
-                    photo, none_str, get_func=get_template_value_multi
-                )
-                new_string = regex_multi.sub(subst, str_template)
-                new_strings.add(new_string)
-
-        # update rendered_strings for the next field to process
-        rendered_strings = new_strings
-
-    # find any {fields} that weren't replaced
-    unmatched = []
-    for rendered_str in rendered_strings:
-        unmatched.extend(
-            [
-                no_match[0]
-                for no_match in re.findall(regex, rendered_str)
-                if no_match[0] not in unmatched
-            ]
-        )
-
-    # fix any escaped curly braces
-    rendered_strings = [
-        rendered_str.replace("{{", "{").replace("}}", "}")
-        for rendered_str in rendered_strings
-    ]
-
-    return rendered_strings, unmatched
-
-
-class DateTimeFormatter:
-    """ provides property access to formatted datetime.datetime strftime values """
-
-    def __init__(self, dt: datetime.datetime):
-        self.dt = dt
-
-    @property
-    def date(self):
-        """ ISO date in form 2020-03-22 """
-        date = self.dt.date().isoformat()
-        return date
-
-    @property
-    def year(self):
-        """ 4 digit year """
-        year = f"{self.dt.year}"
-        return year
-
-    @property
-    def yy(self):
-        """ 2 digit year """
-        yy = f"{self.dt.strftime('%y')}"
-        return yy
-
-    @property
-    def mm(self):
-        """ 2 digit month """
-        mm = f"{self.dt.strftime('%m')}"
-        return mm
-
-    @property
-    def month(self):
-        """ Month as locale's full name """
-        month = f"{self.dt.strftime('%B')}"
-        return month
-
-    @property
-    def mon(self):
-        """ Month as locale's abbreviated name """
-        mon = f"{self.dt.strftime('%b')}"
-        return mon
-
-    @property
-    def doy(self):
-        """ Julian day of year starting from 001 """
-        doy = f"{self.dt.strftime('%j')}"
-        return doy
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -79,16 +79,16 @@
            xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
            ${dc_description(photo.description)}
            ${dc_title(photo.title)}
-            ${dc_subject(photo.keywords + photo.persons)}
+            ${dc_subject(subjects)}
            ${dc_datecreated(photo.date)}
        </rdf:Description>
        <rdf:Description rdf:about='' 
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
-            ${iptc_personinimage(photo.persons)}
+            ${iptc_personinimage(persons)}
        </rdf:Description>
        <rdf:Description rdf:about='' 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
-            ${dk_tagslist(photo.keywords)}
+            ${dk_tagslist(keywords)}
        </rdf:Description>
        <rdf:Description rdf:about='' 
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
--- a/osxphotos/utils.py
+++ b/osxphotos/utils.py
@@ -1,8 +1,11 @@
+import fnmatch
 import glob
 import logging
+import os
 import os.path
 import pathlib
 import platform
+import re
 import sqlite3
 import subprocess
 import sys
@@ -11,6 +14,7 @@ import urllib.parse
 from plistlib import load as plistload

 import CoreFoundation
+import CoreServices
 import objc
 from Foundation import *

@@ -114,6 +118,30 @@ def _dd_to_dms(dd):
    return int(deg_), int(min_), sec_


+def _hardlink_file(src, dest):
+    """ Hardlinks a file from src path to dest path 
+        src: source path as string 
+        dest: destination path as string
+        Raises exception if linking fails or either path is None """
+
+    if src is None or dest is None:
+        raise ValueError("src and dest must not be None", src, dest)
+
+    if not os.path.isfile(src):
+        raise FileNotFoundError("src file does not appear to exist", src)
+
+
+    # if error on copy, subprocess will raise CalledProcessError
+    try:
+        os.link(src, dest)
+    except Exception as e:
+        logging.critical(
+            f"ln returned error: {e.returncode} {e.stderr.decode(sys.getfilesystemencoding()).rstrip()}"
+        )
+        raise e
+
+    
+
 def _copy_file(src, dest, norsrc=False):
    """ Copies a file from src path to dest path 
        src: source path as string 
@@ -302,6 +330,28 @@ def create_path_by_date(dest, dt):
    return new_dest


+def get_preferred_uti_extension(uti):
+    """ get preferred extension for a UTI type
+        uti: UTI str, e.g. 'public.jpeg'
+        returns: preferred extension as str """
+
+    # reference: https://developer.apple.com/documentation/coreservices/1442744-uttypecopypreferredtagwithclass?language=objc
+
+    ext = CoreServices.UTTypeCopyPreferredTagWithClass(
+        uti, CoreServices.kUTTagClassFilenameExtension
+    )
+    return ext
+
+
+def findfiles(pattern, path_):
+    """Returns list of filenames from path_ matched by pattern
+       shell pattern. Matching is case-insensitive."""
+    # See: https://gist.github.com/techtonik/5694830
+
+    rule = re.compile(fnmatch.translate(pattern), re.IGNORECASE)
+    return [name for name in os.listdir(path_) if rule.match(name)]
+
+
 # TODO: this doesn't always work, still looking for a way to
 # force Photos to open the library being operated on
 # def _open_photos_library_applescript(library_path):
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 #
 # setup.py script for osxphotos
 #
-# Copyright (c) 2019 Rhet Turnbull, rturnbull+git@gmail.com
+# Copyright (c) 2019, 2020 Rhet Turnbull, rturnbull+git@gmail.com
 # All rights reserved.
 #
 # Permission is hereby granted, free of charge, to any person
@@ -27,23 +27,43 @@
 # SOFTWARE.

 import os
+import platform
+
 from setuptools import find_packages, setup

-this_directory = os.path.abspath(os.path.dirname(__file__))
-with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
-    long_description = f.read()
+# python version as 2-digit float (e.g. 3.6)
+py_ver = float(".".join(platform.python_version_tuple()[:2]))

+# holds config info read from disk
 about = {}
+this_directory = os.path.abspath(os.path.dirname(__file__))
+
+# get version info from _version
 with open(
    os.path.join(this_directory, "osxphotos", "_version.py"), mode="r", encoding="utf-8"
 ) as f:
    exec(f.read(), about)

+# read README.md into long_description
+with open(os.path.join(this_directory, "README.md"), encoding="utf-8") as f:
+    about["long_description"] = f.read()
+
+# ugly hack to install custom version of bpylist2 needed for Python < 3.8
+# the stock version of bylist2==2.0.3 causes an error related to
+# "pkg_resources.ContextualVersionConflict: (pycodestyle 2.3.1..."
+# PEP 508 no help here as URL-based lookups not allowed in PyPI packages
+# if you know a better way, PRs welcome!
+# once I go to 3.8+ required, this won't be necessary as bpylist2 3.0+ solves this issue
+if py_ver < 3.8:
+    os.system(
+        "python3 -m pip install git+git://github.com/RhetTbull/bpylist2.git#egg=bpylist2"
+    )
+
 setup(
    name="osxphotos",
    version=about["__version__"],
    description="Manipulate (read-only) Apple's Photos app library on Mac OS X",
-    long_description=long_description,
+    long_description=about["long_description"],
    long_description_content_type="text/markdown",
    author="Rhet Turnbull",
    author_email="rturnbull+git@gmail.com",
@@ -58,7 +78,7 @@ setup(
        "Intended Audience :: Developers",
        "License :: OSI Approved :: MIT License",
        "Operating System :: MacOS :: MacOS X",
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.8",
        "Topic :: Software Development :: Libraries :: Python Modules",
    ],
    install_requires=[
@@ -69,6 +89,7 @@ setup(
        "bpylist2==2.0.3;python_version<'3.8'",
        "bpylist2==3.0.0;python_version>='3.8'",
        "pathvalidate==2.2.1",
+        "dataclasses==0.7;python_version<'3.7'",
    ],
    entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
    include_package_data=True,
--- a/tests/README.md
+++ b/tests/README.md
@@ -1,14 +1,22 @@
 # Tests for osxphotos #

 ## Running Tests ##
-Tests require pytest:
+Tests require pytest and pytest-mock:
 `pip install pytest`
+`pip install pytest-mock`

 To run the tests, do the following from the main source folder:
 `python -m pytest tests/`

 Running the tests this way allows the library to be tested without installing it.

+## Skipped Tests ##
+A few tests will look for certain environment variables to determine if they should run.
+
+Some of the export tests rely on photos in my local library and will look for `OSXPHOTOS_TEST_EXPORT=1` to determine if they should run.
+
+One test for locale does not run on GitHub's automated workflow and will look for `OSXPHOTOS_TEST_LOCALE=1` to determine if it should be run.  If you want to run this test, set the environment variable.  
+
 ## Attribution ##
 These tests utilize a test Photos library. The test library is populated with photos from [flickr](https://www.flickr.com).  All images used are licensed under Creative Commons 2.0 Attribution [license](https://creativecommons.org/licenses/by/2.0/).  

--- a/tests/Test-10.12.6.photoslibrary/Masters/2020/04/17/20200417-184043/IMG_1994.CR2
+++ b/tests/Test-10.12.6.photoslibrary/Masters/2020/04/17/20200417-184043/IMG_1994.CR2
--- a/tests/Test-10.12.6.photoslibrary/Masters/2020/04/17/20200417-184043/IMG_1994.JPG
+++ b/tests/Test-10.12.6.photoslibrary/Masters/2020/04/17/20200417-184043/IMG_1994.JPG
--- a/tests/Test-10.12.6.photoslibrary/Masters/2020/04/17/20200417-184207/IMG_1998.CR2
+++ b/tests/Test-10.12.6.photoslibrary/Masters/2020/04/17/20200417-184207/IMG_1998.CR2
--- a/tests/Test-10.12.6.photoslibrary/database/RKAlbum_name.skindex
+++ b/tests/Test-10.12.6.photoslibrary/database/RKAlbum_name.skindex
--- a/tests/Test-10.12.6.photoslibrary/database/RKVersion_searchIndexText.skindex
+++ b/tests/Test-10.12.6.photoslibrary/database/RKVersion_searchIndexText.skindex
--- a/tests/Test-10.12.6.photoslibrary/database/photos.db
+++ b/tests/Test-10.12.6.photoslibrary/database/photos.db
--- a/tests/Test-10.12.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
+++ b/tests/Test-10.12.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
@@ -5,7 +5,7 @@
 	<key>LithiumMessageTracer</key>
 	<dict>
 		<key>LastReportedDate</key>
-		<date>2019-12-08T16:44:38Z</date>
+		<date>2020-04-17T18:39:50Z</date>
 	</dict>
 	<key>PXPeopleScreenUnlocked</key>
 	<true/>
--- a/tests/Test-10.12.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.12.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-01-22T02:10:26Z</date>
+	<date>2020-04-17T18:40:46Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-01-22T02:10:27Z</date>
+	<date>2020-04-17T18:39:51Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.12.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
+++ b/tests/Test-10.12.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
--- a/tests/Test-10.12.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_a.jpeg
+++ b/tests/Test-10.12.6.photoslibrary/resources/media/master/00/00/fullsizeoutput_a.jpeg
--- a/tests/Test-10.12.6.photoslibrary/resources/moments/analysismetadata.plist
+++ b/tests/Test-10.12.6.photoslibrary/resources/moments/analysismetadata.plist
@@ -11,6 +11,6 @@
 	<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
 	<integer>1</integer>
 	<key>PLLastRevGeoVerFileFetchDateKey</key>
-	<date>2020-01-19T17:29:28Z</date>
+	<date>2020-04-17T18:39:52Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.12.6.photoslibrary/resources/moments/historicalmarker.plist
+++ b/tests/Test-10.12.6.photoslibrary/resources/moments/historicalmarker.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>LastHistoryRowId</key>
-	<integer>414</integer>
+	<integer>502</integer>
 	<key>LibraryBuildTag</key>
 	<string>E3E46F2A-7168-4973-AB3E-5848F80BFC7D</string>
 	<key>LibrarySchemaVersion</key>
--- a/tests/Test-10.12.6.photoslibrary/resources/moments/needsanalysis
+++ b/tests/Test-10.12.6.photoslibrary/resources/moments/needsanalysis
--- a/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_mini_8.jpg
+++ b/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_mini_8.jpg
--- a/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_thumb_8.jpg
+++ b/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_thumb_8.jpg
--- a/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_mini_9.jpg
+++ b/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_mini_9.jpg
--- a/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_thumb_9.jpg
+++ b/tests/Test-10.12.6.photoslibrary/resources/proxies/derivatives/00/00/9/UNADJUSTEDRAW_thumb_9.jpg
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/Info.plist
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/Info.plist
@@ -9,7 +9,7 @@
 	<key>HistoricalMarker</key>
 	<dict>
 		<key>LastHistoryRowId</key>
-		<integer>414</integer>
+		<integer>502</integer>
 		<key>LibraryBuildTag</key>
 		<string>E3E46F2A-7168-4973-AB3E-5848F80BFC7D</string>
 		<key>LibrarySchemaVersion</key>
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKAlbumVersion/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKAlbumVersion/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKFolder/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKFolder/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKImportGroup/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKImportGroup/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKMaster/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKMaster/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKModelResource/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKModelResource/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKSceneInVersion/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKSceneInVersion/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
+++ b/tests/Test-10.12.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
--- a/tests/Test-10.12.6.photoslibrary/resources/segments/Thumb64Segment_0.data
+++ b/tests/Test-10.12.6.photoslibrary/resources/segments/Thumb64Segment_0.data
--- a/tests/Test-10.12.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
+++ b/tests/Test-10.12.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
--- a/tests/Test-10.13.6.photoslibrary/database/RKAlbum_name.skindex
+++ b/tests/Test-10.13.6.photoslibrary/database/RKAlbum_name.skindex
--- a/tests/Test-10.13.6.photoslibrary/database/RKVersion_searchIndexText.skindex
+++ b/tests/Test-10.13.6.photoslibrary/database/RKVersion_searchIndexText.skindex
--- a/tests/Test-10.13.6.photoslibrary/database/photos.db
+++ b/tests/Test-10.13.6.photoslibrary/database/photos.db
--- a/tests/Test-10.13.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
+++ b/tests/Test-10.13.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
@@ -8,8 +8,11 @@
 		<array/>
 		<key>ExpandedSidebarItemIdentifiers</key>
 		<array>
+			<string>obfeGcvoT1auxoh2Tu86OQ</string>
 			<string>TopLevelAlbums</string>
 			<string>TopLevelSlideshows</string>
+			<string>MBS8+gBrQCWQxmcav+C8HQ</string>
+			<string>cHwwVoUiQ8a2nZNXgVsnCA</string>
 		</array>
 		<key>IPXWorkspaceControllerZoomLevelsKey</key>
 		<dict>
@@ -23,11 +26,11 @@
 			<key>key</key>
 			<integer>1</integer>
 			<key>lastKnownDisplayName</key>
-			<string>September 28, 2018</string>
+			<string>Pumpkin Farm (1)</string>
 			<key>type</key>
 			<string>album</string>
 			<key>uuid</key>
-			<string>+Ep8CrNRRhea9eVA618FMg</string>
+			<string>AU8Gp8bwRlOvngZFgwXBdg</string>
 		</dict>
 		<key>lastKnownItemCounts</key>
 		<dict>
--- a/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2019-07-28T01:23:52Z</date>
+	<date>2020-04-30T14:09:38Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2019-07-28T01:23:52Z</date>
+	<date>2020-05-01T04:27:48Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/liveupdate-photosgraph.graphdb
+++ b/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/liveupdate-photosgraph.graphdb
--- a/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
+++ b/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
--- a/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb-shm
+++ b/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb-shm
--- a/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/VisionService/PersonPromoter
+++ b/tests/Test-10.13.6.photoslibrary/private/com.apple.photoanalysisd/VisionService/PersonPromoter
@@ -2,7 +2,11 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>ProcessedInQuiescentState</key>
+	<true/>
 	<key>SuggestedMeIdentifier</key>
 	<string></string>
+	<key>Version</key>
+	<integer>3</integer>
 </dict>
 </plist>
--- a/tests/Test-10.13.6.photoslibrary/private/com.apple.photomodel/appPrivateData.plist
+++ b/tests/Test-10.13.6.photoslibrary/private/com.apple.photomodel/appPrivateData.plist
@@ -5,7 +5,7 @@
 	<key>LithiumMessageTracer</key>
 	<dict>
 		<key>LastReportedDate</key>
-		<date>2019-07-27T12:01:15Z</date>
+		<date>2020-05-01T03:34:50Z</date>
 	</dict>
 </dict>
 </plist>
--- a/tests/Test-10.13.6.photoslibrary/resources/moments/analysismetadata.plist
+++ b/tests/Test-10.13.6.photoslibrary/resources/moments/analysismetadata.plist
@@ -11,6 +11,6 @@
 	<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
 	<integer>1</integer>
 	<key>PLLastRevGeoVerFileFetchDateKey</key>
-	<date>2019-07-26T20:15:18Z</date>
+	<date>2020-04-30T12:51:41Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.13.6.photoslibrary/resources/moments/historicalmarker.plist
+++ b/tests/Test-10.13.6.photoslibrary/resources/moments/historicalmarker.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>LastHistoryRowId</key>
-	<integer>615</integer>
+	<integer>670</integer>
 	<key>LibraryBuildTag</key>
 	<string>BEA5F0E8-BA6B-4462-8F73-3E53BBE4C943</string>
 	<key>LibrarySchemaVersion</key>
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/Info.plist
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/Info.plist
@@ -9,7 +9,7 @@
 	<key>HistoricalMarker</key>
 	<dict>
 		<key>LastHistoryRowId</key>
-		<integer>615</integer>
+		<integer>670</integer>
 		<key>LibraryBuildTag</key>
 		<string>BEA5F0E8-BA6B-4462-8F73-3E53BBE4C943</string>
 		<key>LibrarySchemaVersion</key>
@@ -24,7 +24,7 @@
 	<key>SnapshotCompletedDate</key>
 	<date>2019-07-26T20:15:17Z</date>
 	<key>SnapshotLastValidated</key>
-	<date>2019-07-27T12:01:15Z</date>
+	<date>2020-05-01T03:34:50Z</date>
 	<key>SnapshotTables</key>
 	<dict/>
 </dict>
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKAlbumVersion/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKAlbumVersion/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKFolder/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKFolder/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/recovery/RKVolume/0000000000.lij
+++ b/tests/Test-10.13.6.photoslibrary/resources/recovery/RKVolume/0000000000.lij
--- a/tests/Test-10.13.6.photoslibrary/resources/segments/Thumb64Segment_0.data
+++ b/tests/Test-10.13.6.photoslibrary/resources/segments/Thumb64Segment_0.data
--- a/tests/Test-10.13.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
+++ b/tests/Test-10.13.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
--- a/tests/Test-10.14.6.photoslibrary/database/RKAlbum_name.skindex
+++ b/tests/Test-10.14.6.photoslibrary/database/RKAlbum_name.skindex
--- a/tests/Test-10.14.6.photoslibrary/database/photos.db
+++ b/tests/Test-10.14.6.photoslibrary/database/photos.db
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.Photos/appPrivateData.plist
@@ -9,12 +9,14 @@
 		<key>ExpandedSidebarItemIdentifiers</key>
 		<array>
 			<string>TopLevelAlbums</string>
+			<string>QtSnVvTkQ%i2z3hB834M1A</string>
 			<string>TopLevelSlideshows</string>
+			<string>N7eQ4VhfTfeHFp9PPHaJDw</string>
 		</array>
 		<key>IPXWorkspaceControllerZoomLevelsKey</key>
 		<dict>
 			<key>kZoomLevelIdentifierAlbums</key>
-			<integer>10</integer>
+			<integer>5</integer>
 			<key>kZoomLevelIdentifierVersions</key>
 			<integer>7</integer>
 		</dict>
@@ -23,11 +25,11 @@
 			<key>key</key>
 			<integer>1</integer>
 			<key>lastKnownDisplayName</key>
-			<string>Test Album (1)</string>
+			<string>Pumpkin Farm (1)</string>
 			<key>type</key>
 			<string>album</string>
 			<key>uuid</key>
-			<string>Uq6qsKihRRSjMHTiD+0Azg</string>
+			<string>xJ8ya3NBRWC24gKhcwwNeQ</string>
 		</dict>
 		<key>lastKnownItemCounts</key>
 		<dict>
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-03-27T04:00:09Z</date>
+	<date>2020-04-25T23:54:43Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-03-27T04:00:10Z</date>
+	<date>2020-04-26T06:26:10Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/construction-photosgraph.graphdb-shm
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/construction-photosgraph.graphdb-shm
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph-tmp.graphdb-shm
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph-tmp.graphdb-shm
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photomodel/appPrivateData.plist
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photomodel/appPrivateData.plist
@@ -5,7 +5,7 @@
 	<key>LithiumMessageTracer</key>
 	<dict>
 		<key>LastReportedDate</key>
-		<date>2020-03-15T20:19:24Z</date>
+		<date>2020-04-17T17:51:16Z</date>
 	</dict>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/resources/moments/analysismetadata.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/moments/analysismetadata.plist
@@ -11,6 +11,6 @@
 	<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
 	<integer>1</integer>
 	<key>PLLastRevGeoVerFileFetchDateKey</key>
-	<date>2020-03-27T03:59:54Z</date>
+	<date>2020-04-25T23:54:29Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/resources/moments/historicalmarker.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/moments/historicalmarker.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>LastHistoryRowId</key>
-	<integer>575</integer>
+	<integer>606</integer>
 	<key>LibraryBuildTag</key>
 	<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 	<key>LibrarySchemaVersion</key>
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist
@@ -9,7 +9,7 @@
 	<key>HistoricalMarker</key>
 	<dict>
 		<key>LastHistoryRowId</key>
-		<integer>575</integer>
+		<integer>606</integer>
 		<key>LibraryBuildTag</key>
 		<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 		<key>LibrarySchemaVersion</key>
@@ -24,7 +24,7 @@
 	<key>SnapshotCompletedDate</key>
 	<date>2019-07-27T13:16:43Z</date>
 	<key>SnapshotLastValidated</key>
-	<date>2020-03-27T04:02:59Z</date>
+	<date>2020-04-25T23:56:35Z</date>
 	<key>SnapshotTables</key>
 	<dict/>
 </dict>
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbumVersion/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbumVersion/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKFolder/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKFolder/0000000000.lij
--- a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite
+++ b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite
--- a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm
+++ b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm
--- a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal
+++ b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal
--- a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock
@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>685</integer>
+	<integer>725</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>
--- a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite
+++ b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rhet Turnbull	a80dee401c	Implemented PhotoInfo.exiftool	2020-05-14 12:55:17 -07:00
Rhet Turnbull	e67fce2871	Updated CHANGELOG.md	2020-05-14 06:46:12 -07:00
Rhet Turnbull	53304d7023	Added ExifInfo (Photos 5 only)	2020-05-13 22:42:33 -07:00
Rhet Turnbull	d1af14dbb4	Added as_dict to ExifTool	2020-05-11 05:07:19 -07:00
Rhet Turnbull	ca8f2b8d5c	Added link to original work by @simonw	2020-05-10 22:05:21 -05:00
Rhet Turnbull	e3e5a20681	Merge branch 'master' of https://github.com/RhetTbull/osxphotos	2020-05-10 19:55:54 -07:00
Rhet Turnbull	98b3f63a92	Refactored photosdb and photoinfo to add SearchInfo and labels	2020-05-10 19:55:09 -07:00
Rhet Turnbull	c8128203f4	removed flake8	2020-05-10 11:09:35 -05:00
Rhet Turnbull	c061161605	Added pytest-mock	2020-05-10 11:06:45 -05:00
Rhet Turnbull	397db0d72f	Updated a couple of tests to use pytest-mock	2020-05-10 09:00:56 -07:00
Rhet Turnbull	605d63aa4f	Updated README.md to add link to wiki	2020-05-09 13:39:10 -05:00
Rhet Turnbull	ac9b6d52a3	Update README.md	2020-05-09 10:27:44 -05:00
Rhet Turnbull	57315d4449	Added additional test for --export-as-hardlink	2020-05-08 15:53:20 -07:00
Rhet Turnbull	49cfd0b93e	Merge pull request #127 from britiscurious/master fixed some minor findings...	2020-05-08 17:35:40 -05:00
britiscurious	b15f744aab	Update cli.py correction of the name of the shell script to build an executable	2020-05-09 00:06:04 +02:00
britiscurious	cc8b10e792	Update README.md fixed minor typo	2020-05-09 00:03:58 +02:00
Rhet Turnbull	93835130c2	Update README.md to include GitHub Workflow status	2020-05-08 16:50:03 -05:00
Rhet Turnbull	df13683d11	Merge pull request #126 from britiscurious/master added --export-as-hardlink option	2020-05-08 16:40:11 -05:00
britiscurious	b0ec6c6b36	added test for export using hardlinks, fixed a test that failed if users locale settings were different to en_US	2020-05-08 23:29:18 +02:00
britiscurious	cb124713d6	version increment after adding --export-as-hardlink option	2020-05-08 23:06:32 +02:00
britiscurious	97d3c69ade	Update osxphotos/utils.py Co-authored-by: Rhet Turnbull <rturnbull@gmail.com>	2020-05-08 22:56:43 +02:00
britiscurious	a8622b6b90	Update osxphotos/utils.py Co-authored-by: Rhet Turnbull <rturnbull@gmail.com>	2020-05-08 22:56:24 +02:00
britiscurious	cceab62993	Update osxphotos/utils.py Co-authored-by: Rhet Turnbull <rturnbull@gmail.com>	2020-05-08 22:56:12 +02:00
britiscurious	69356c0b57	Update osxphotos/utils.py Co-authored-by: Rhet Turnbull <rturnbull@gmail.com>	2020-05-08 22:55:56 +02:00
britiscurious	5eb0876e33	added --export-as-hardlink option	2020-05-08 21:13:50 +02:00
Rhet Turnbull	7444b6d173	Updated test for 10.15.4	2020-05-02 07:39:34 -07:00
Rhet Turnbull	180450c1e7	Added test for folder_names on 10.15.4, closes #119	2020-05-02 07:33:15 -07:00
Rhet Turnbull	00e16611fc	added CHANGELOG.md	2020-05-01 22:32:05 -07:00
Rhet Turnbull	65674f57bc	added --keyword-template	2020-05-01 22:05:46 -07:00
Rhet Turnbull	7af1ccd4ed	Fixed bug related to issue #119	2020-04-30 21:38:24 -07:00
Rhet Turnbull	1b6f661e6b	test library updates	2020-04-30 13:02:11 -07:00
Rhet Turnbull	a57da2346b	Bug fix for albums in Photos <= 4 to address issue #116	2020-04-28 18:20:26 -07:00
Rhet Turnbull	3fe03cd127	version bump for pypi	2020-04-28 07:54:22 -07:00
Rhet Turnbull	5cc98c338b	Update README.md	2020-04-28 07:48:54 -07:00
Rhet Turnbull	1c9d4f282b	Update README.md	2020-04-28 07:44:00 -07:00
Rhet Turnbull	1ceda15134	Fixed implementation of use_albums_as_keywords and use_persons_as_keywords, closes #115	2020-04-28 07:41:37 -07:00
Rhet Turnbull	a80071111f	Updated README.md	2020-04-28 07:10:48 -07:00
Rhet Turnbull	072a8d795e	Updated CHANGELOG.md	2020-04-27 23:16:31 -07:00
Rhet Turnbull	b35b071634	Added --album-keyword and --person-keyword to CLI, closes #61	2020-04-27 23:08:59 -07:00
Rhet Turnbull	56a000609f	Updated tests/README.md	2020-04-26 16:31:24 -07:00
Rhet Turnbull	54d5d4b7ba	Updated test libraries	2020-04-26 16:04:03 -07:00
Rhet Turnbull	38137a1351	Updated CHANGELOG.md	2020-04-26 16:03:26 -07:00
Rhet Turnbull	4b29a2e05f	Merge branch 'master' of https://github.com/RhetTbull/osxphotos	2020-04-26 15:57:51 -07:00
Rhet Turnbull	9be0f849b7	Updated test to avoid issue with GitHub workflow	2020-04-26 15:57:43 -07:00
Rhet Turnbull	ccb5f252d1	Update pythonpackage.yml to remove older pythons	2020-04-26 15:39:37 -07:00
Rhet Turnbull	d8a64c9573	Fixed locale bug in templates, closes #113	2020-04-26 15:20:28 -07:00
Rhet Turnbull	81d4e392c3	Updated CHANGELOG.md	2020-04-20 22:22:08 -07:00
Rhet Turnbull	85d2baac10	Updated setup.py and README with install instructions	2020-04-20 22:13:42 -07:00
Rhet Turnbull	8a768e62ce	Still working on bpylist2 install error	2020-04-20 21:35:12 -07:00
Rhet Turnbull	1c8eb764f5	Merge branch 'master' of https://github.com/RhetTbull/osxphotos	2020-04-20 21:21:54 -07:00
Rhet Turnbull	8e4b88ad1f	Updated setup.py to resolve issue with bpylist2 on python < 3.8	2020-04-20 21:21:47 -07:00
Rhet Turnbull	3f80f786a3	Update README.md to clarify install instructions	2020-04-20 08:01:09 -07:00
Rhet Turnbull	a337e79e13	added raw_is_original handling	2020-04-19 19:16:43 -07:00
Rhet Turnbull	ec68feec49	Removed warning from path_raw	2020-04-19 18:39:53 -07:00
Rhet Turnbull	9b9b54e590	Updated tests and test library with RAW images	2020-04-19 18:24:24 -07:00
Rhet Turnbull	22f1e8f2a6	Updated CHANGELOG.md	2020-04-19 00:04:47 -07:00
Rhet Turnbull	1867c1d747	added __len__ to PhotosDB, closes #44	2020-04-18 23:57:34 -07:00
Rhet Turnbull	87eb84fddd	Updated use of _PHOTOS_4_VERSION, closes #106	2020-04-18 23:33:02 -07:00
Rhet Turnbull	15a3736b74	Fixed documentation error	2020-04-18 23:10:13 -07:00
Rhet Turnbull	cf28cb6452	Added cli.py for use with pyinstaller	2020-04-18 18:34:09 -07:00
Rhet Turnbull	f20fadcef7	Fixed some stray tabs	2020-04-18 13:38:37 -07:00
Rhet Turnbull	3bac106eb7	test library update	2020-04-18 12:24:03 -07:00
Rhet Turnbull	47d1c82c03	Added folder support for Photos <= 4, closes #93	2020-04-18 12:21:08 -07:00
Rhet Turnbull	6f281711e2	cleaned up SQL statements in _process_database4	2020-04-18 08:05:43 -07:00
Rhet Turnbull	4b30b3b426	Fixed suffix check on export to be case insensitive	2020-04-18 07:59:04 -07:00
Rhet Turnbull	1fa9583ea6	Updated CHANGELOG.md	2020-04-17 23:33:17 -07:00
Rhet Turnbull	235e1fb1a6	Updated README.md	2020-04-17 23:23:57 -07:00
Rhet Turnbull	36c2821a0f	replaced CLI option --original-name with --current-name	2020-04-17 23:20:23 -07:00
Rhet Turnbull	ed425724a0	Changed default CLI behavior to export all photos	2020-04-17 22:52:11 -07:00
Rhet Turnbull	55daa31c71	Update README.md	2020-04-17 12:46:56 -07:00
Rhet Turnbull	b6ac9e1ea3	Updated test library for Sierra	2020-04-17 11:52:55 -07:00
Rhet Turnbull	9d151478d6	Initial support for RAW photos in Photos 4 to address issue #101	2020-04-17 10:44:15 -07:00
Rhet Turnbull	7d55844390	Added --export-raw to CLI export	2020-04-16 23:10:33 -07:00
Rhet Turnbull	f398e9116f	Added --has-raw to CLI query and export	2020-04-16 16:46:29 -07:00
Rhet Turnbull	4fe8190b57	Added raw details to PhotoInfo json() and __str__()	2020-04-16 16:11:47 -07:00
Rhet Turnbull	7e42ebb240	Initial work on suppport for associated RAW images	2020-04-16 11:53:48 -07:00
Rhet Turnbull	edae116baa	Test library update	2020-04-16 11:53:05 -07:00
Rhet Turnbull	d542cda17d	Small fix to database version logic to look into issue #102	2020-04-15 14:09:47 -07:00
Rhet Turnbull	99b5b54c6d	Update README.md	2020-04-15 11:38:57 -07:00
Rhet Turnbull	379feddcda	Updated README.md to add Known Bugs section	2020-04-15 11:37:38 -07:00
Rhet Turnbull	24285f5dd2	Update README.md	2020-04-13 00:53:50 -07:00
Rhet Turnbull	3cb3ebb300	Updated CHANGELOG.md	2020-04-13 00:46:08 -07:00
Rhet Turnbull	16037f10fa	Update README.md	2020-04-12 23:50:04 -07:00
Rhet Turnbull	ebd21491ac	Updated examples to work with latest version	2020-04-12 20:57:37 -07:00
Rhet Turnbull	b7c7b9f066	Added {folder_album} to template and --folder to CLI	2020-04-12 14:53:53 -07:00
Rhet Turnbull	21e7020fec	Test library update	2020-04-12 14:52:35 -07:00
Rhet Turnbull	952741d488	Updated CHANGELOG.md	2020-04-12 12:27:49 -07:00