Added --dry-run option to CLI export, closes #91

Catch exception in folder processing to address #148
Added test for DateTimeFormatter.dow
2020-05-25 10:37:30 -07:00 · 2020-05-24 07:22:00 -07:00 · 2020-05-24 06:37:15 -07:00 · 2020-05-24 06:17:40 -07:00 · 2020-05-24 14:20:25 +02:00 · 2020-05-23 21:39:40 -07:00
32 changed files with 3124 additions and 936 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,41 @@ 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.29.2](https://github.com/RhetTbull/osxphotos/compare/v0.29.1...v0.29.2)
+
+> 24 May 2020
+
+- Added try/except for bad datettime values [`1d095d7`](https://github.com/RhetTbull/osxphotos/commit/1d095d7284bae57037b8b200c8b3422835c611b2)
+
+#### [v0.29.1](https://github.com/RhetTbull/osxphotos/compare/v0.29.0...v0.29.1)
+
+> 23 May 2020
+
+- Catch illegal timestamp value [`#146`](https://github.com/RhetTbull/osxphotos/pull/146)
+- Updated CHANGELOG.md [`1450b3c`](https://github.com/RhetTbull/osxphotos/commit/1450b3ccace326fe1c0ed810a1b40e781709acb3)
+
+#### [v0.29.0](https://github.com/RhetTbull/osxphotos/compare/v0.28.19...v0.29.0)
+
+> 23 May 2020
+
+- Made --exiftool and --export-as-hardlink incompatible in CLI to fix #132 [`#132`](https://github.com/RhetTbull/osxphotos/issues/132)
+- Added --update to CLI export; reference issue #100 [`b1171e9`](https://github.com/RhetTbull/osxphotos/commit/b1171e96cc06362555725995bb311317eb163e49)
+- Added as_dict to PlaceInfo [`8c4fe40`](https://github.com/RhetTbull/osxphotos/commit/8c4fe40aa6850f166e526cffaa088550884399af)
+- Updated README.md [`11d368a`](https://github.com/RhetTbull/osxphotos/commit/11d368a69cbe67e909e64b020f0334fc09dd3ac4)
+- Updated CHANGELOG.md [`cafa483`](https://github.com/RhetTbull/osxphotos/commit/cafa483cfc228c651a03d3361d6d48a35deab1e8)
+- version bump [`c06c230`](https://github.com/RhetTbull/osxphotos/commit/c06c230a469754691d11fff1034fb02daeeba649)
+
+#### [v0.28.19](https://github.com/RhetTbull/osxphotos/compare/v0.28.18...v0.28.19)
+
+> 15 May 2020
+
+- Added label and label_normalized to template system, closes #130 [`#130`](https://github.com/RhetTbull/osxphotos/issues/130)
+- Revert "test library updates" [`48e9c32`](https://github.com/RhetTbull/osxphotos/commit/48e9c32add549e66c3ef8c65f8821f5033b55b11)
+- test library updates [`d125854`](https://github.com/RhetTbull/osxphotos/commit/d125854f2a04e37747af3e0796370a565c1c9bd0)
+- Updated CHANGELOG.md [`e228cfa`](https://github.com/RhetTbull/osxphotos/commit/e228cfab746055c8d6df428aebe0ed001fb6d4d0)
+- version bump [`bd9d5a2`](https://github.com/RhetTbull/osxphotos/commit/bd9d5a26f3bfcbb33896a139fa86cdab46768103)
+- Update README.md [`85760dc`](https://github.com/RhetTbull/osxphotos/commit/85760dc4fe2274d826ed80494fd4e66866398609)
+
 #### [v0.28.18](https://github.com/RhetTbull/osxphotos/compare/v0.28.17...v0.28.18)

 > 14 May 2020
@@ -28,6 +63,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 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)
+- Updated a couple of tests to use pytest-mock [`397db0d`](https://github.com/RhetTbull/osxphotos/commit/397db0d72fb218669a9ecbff134fa9b392a14661)
+- added test for export using hardlinks, fixed a test that failed if users locale settings were different to en_US [`b0ec6c6`](https://github.com/RhetTbull/osxphotos/commit/b0ec6c6b36d8cfe05723d47b210d9d7c5aabdfe5)

 #### [v0.28.13](https://github.com/RhetTbull/osxphotos/compare/v0.28.10...v0.28.13)

@@ -52,6 +89,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 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)
+- Update README.md [`1c9d4f2`](https://github.com/RhetTbull/osxphotos/commit/1c9d4f282beea2ac12273c8d0f9453bad1255c2c)

 #### [v0.28.7](https://github.com/RhetTbull/osxphotos/compare/v0.28.6...v0.28.7)

@@ -80,6 +118,8 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 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)
+- added raw_is_original handling [`a337e79`](https://github.com/RhetTbull/osxphotos/commit/a337e79e13802b4824c2f088ce9db1c027d6f3c5)
+- Updated CHANGELOG.md [`22f1e8f`](https://github.com/RhetTbull/osxphotos/commit/22f1e8f2a6478e0576f6bff53e348aad8680ae69)

 #### [0.28.2](https://github.com/RhetTbull/osxphotos/compare/v0.28.1...0.28.2)

@@ -89,6 +129,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - 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)
+- test library update [`3bac106`](https://github.com/RhetTbull/osxphotos/commit/3bac106eb7a180e9e39643a89087d92bf2a437d0)

 #### [v0.28.1](https://github.com/RhetTbull/osxphotos/compare/v0.27.4...v0.28.1)

@@ -128,6 +169,7 @@ 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)

@@ -161,6 +203,8 @@ 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)

@@ -239,6 +283,8 @@ 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)

@@ -273,6 +319,8 @@ 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)

@@ -285,6 +333,8 @@ 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)

@@ -295,6 +345,8 @@ 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)

@@ -345,10 +397,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.15.0...v0.15.1)

-> 14 May 2020
+> 24 May 2020

 #### [v0.15.0](https://github.com/RhetTbull/osxphotos/compare/v0.14.21...v0.15.0)

@@ -368,6 +422,8 @@ 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
@@ -201,7 +201,13 @@ Options:
                                  Search by end item date, e.g.
                                  2000-01-12T12:00:00 or 2000-12-31 (ISO 8601
                                  w/o TZ).
+  --update                        Only export new or updated files. See notes
+                                  below on export and --update.
+  --dry-run                       Dry run (test) the export but don't actually
+                                  export any files; most useful with --verbose
  --export-as-hardlink            Hardlink files instead of copying them.
+                                  Cannot be used with --exiftool which creates
+                                  copies of the files with embedded EXIF data.
  --overwrite                     Overwrite existing files. Default behavior
                                  is to add (1), (2), etc to filename if file
                                  already exists. Use this with caution as it
@@ -270,7 +276,8 @@ Options:
                                  exported photos. To use this option,
                                  exiftool must be installed and in the path.
                                  exiftool may be installed from
-                                  https://exiftool.org/
+                                  https://exiftool.org/.  Cannot be used with
+                                  --export-as-hardlink.
  --directory DIRECTORY           Optional template for specifying name of
                                  output directory in the form
                                  '{name,DEFAULT}'. See below for additional
@@ -282,7 +289,35 @@ Options:
                                  get an error while exporting.
  -h, --help                      Show this message and exit.

-**Templating System**
+** Export **
+When exporting photos, osxphotos creates a database in the top-level export
+folder called '.osxphotos_export.db'.  This database preserves state
+information used for determining which files need to be updated when run with
+--update.  It is recommended that if you later move the export folder tree you
+also move the database file.
+
+The --update option will only copy new or updated files from the library to
+the export folder.  If a file is changed in the export folder (for example,
+you edited the exported image), osxphotos will detect this as a difference and
+re-export the original image from the library thus overwriting the changes.
+If using --update, the exported library should be treated as a backup, not a
+working copy where you intend to make changes.
+
+Note: The number of files reported for export and the number actually exported
+may differ due to live photos, associated RAW images, and edited photos which
+are reported in the total photos exported.
+
+Implementation note: To determine which files need to be updated, osxphotos
+stores file signature information in the '.osxphotos_export.db' database. The
+signature includes size, modification time, and filename.  In order to
+minimize run time, --update does not do a full comparison (diff) of the files
+nor does it compare hashes of the files.  In normal usage, this is sufficient
+for updating the library. You can always run export without the --update
+option to re-export the entire library thus rebuilding the
+'.osxphotos_export.db' database.
+
+
+** Templating System **

 With the --directory option you may specify a template for the export
 directory.  This directory will be appended to the export path specified in
@@ -336,6 +371,8 @@ Substitution                    Description
                                creation time
 {created.mon}                   Month abbreviation in the user's locale of
                                the file creation time
+{created.dd}                    2-digit day of the month (zero padded) of
+                                file creation time
 {created.doy}                   3-digit day of year (e.g Julian day) of file
                                creation time, starting from 1 (zero padded)
 {modified.date}                 Photo's modification date in ISO format,
@@ -348,6 +385,8 @@ Substitution                    Description
                                modification time
 {modified.mon}                  Month abbreviation in the user's locale of
                                the file modification time
+{modified.dd}                   2-digit day of the month (zero padded) of
+                                the file modification time
 {modified.doy}                  3-digit day of year (e.g Julian day) of file
                                modification time, starting from 1 (zero
                                padded)
@@ -387,13 +426,16 @@ 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
-{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
+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
+{label}             Image categorization label associated with a photo
+                    (Photos 5 only)
+{label_normalized}  All lower case version of 'label' (Photos 5 only)
 ```

 Example: export all photos to ~/Desktop/export group in folders by date created
@@ -1095,7 +1137,7 @@ Export photo from the Photos library to another destination on disk.
 - 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
+Returns: list of paths to exported files. More than one file could be exported, for example if live_photo=True, both the original image and the associated .mov file will be exported

 The json sidecar file can be used by exiftool to apply the metadata from the json file to the image.  For example: 

@@ -1323,7 +1365,7 @@ The following substitutions are availabe for use with `PhotoInfo.render_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|
 |{descr}|Description of the photo|
@@ -1333,6 +1375,7 @@ The following substitutions are availabe for use with `PhotoInfo.render_template
 |{created.mm}|2-digit month of the file creation time (zero padded)|
 |{created.month}|Month name in user's locale of the file creation time|
 |{created.mon}|Month abbreviation in the user's locale of the file creation time|
+|{created.dd}|2-digit day of the month (zero padded) of file creation time|
 |{created.doy}|3-digit day of year (e.g Julian day) of file creation time, starting from 1 (zero padded)|
 |{modified.date}|Photo's modification date in ISO format, e.g. '2020-03-22'|
 |{modified.year}|4-digit year of file modification time|
@@ -1340,6 +1383,7 @@ The following substitutions are availabe for use with `PhotoInfo.render_template
 |{modified.mm}|2-digit month of the file modification time (zero padded)|
 |{modified.month}|Month name in user's locale of the file modification time|
 |{modified.mon}|Month abbreviation in the user's locale of the file modification time|
+|{modified.dd}|2-digit day of the month (zero padded) of the file modification time|
 |{modified.doy}|3-digit day of year (e.g Julian day) of file modification time, starting from 1 (zero padded)|
 |{place.name}|Place name from the photo's reverse geolocation data, as displayed in Photos|
 |{place.country_code}|The ISO country code from the photo's reverse geolocation data|
@@ -1355,8 +1399,11 @@ The following substitutions are availabe for use with `PhotoInfo.render_template
 |{place.address.country}|Country name of the postal address, e.g. 'United States'|
 |{place.address.country_code}|ISO country code of the postal address, e.g. 'US'|
 |{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|
+|{label}|Image categorization label associated with a photo (Photos 5 only)|
+|{label_normalized}|All lower case version of 'label' (Photos 5 only)|


 ### Utility Functions
@@ -1382,11 +1429,6 @@ Convert latitude, longitude in degrees to degrees, minutes, seconds as string.
 returns: string tuple in format ("51 deg 30' 12.86\\" N", "0 deg 7' 54.50\\" W")
 This is the same format used by exiftool's json format.

-#### `create_path_by_date(dest, dt)`
-Creates a path in dest folder in form dest/YYYY/MM/DD/
- `dest`: valid path as str
- `dt`: datetime.timetuple() object
-Checks to see if path exists, if it does, do nothing and return path. If path does not exist, creates it and returns path.  Useful for exporting photos to a date-based folder structure.

 ## Examples

--- a/osxphotos/main.py
+++ b/osxphotos/main.py
@@ -1,11 +1,14 @@
+""" command line interface for osxphotos """
 import csv
 import datetime
+import functools
 import json
 import logging
 import os
 import os.path
 import pathlib
 import sys
+import time

 import click
 import yaml
@@ -19,10 +22,28 @@ from pathvalidate import (
 import osxphotos

 from ._constants import _EXIF_TOOL_URL, _PHOTOS_4_VERSION, _UNKNOWN_PLACE
+from .datetime_formatter import DateTimeFormatter
 from ._version import __version__
 from .exiftool import get_exiftool_path
-from .photoinfo.template import TEMPLATE_SUBSTITUTIONS, TEMPLATE_SUBSTITUTIONS_MULTI_VALUED
-from .utils import _copy_file, create_path_by_date
+from .fileutil import FileUtil, FileUtilNoOp
+from .photoinfo import ExportResults
+from .photoinfo.template import (
+    TEMPLATE_SUBSTITUTIONS,
+    TEMPLATE_SUBSTITUTIONS_MULTI_VALUED,
+)
+from ._export_db import ExportDB, ExportDBInMemory
+
+# global variable to control verbose output
+# set via --verbose/-V
+VERBOSE = False
+
+# name of export DB
+OSXPHOTOS_EXPORT_DB = ".osxphotos_export.db"
+
+
+def verbose(*args, **kwargs):
+    if VERBOSE:
+        click.echo(*args, **kwargs)


 def get_photos_db(*db_options):
@@ -74,9 +95,43 @@ class ExportCommand(click.Command):
        help_text = super().get_help(ctx)
        formatter = click.HelpFormatter()

-        formatter.write("\n\n")
        # passed to click.HelpFormatter.write_dl for formatting
-        formatter.write_text("**Templating System**")
+
+        formatter.write("\n\n")
+        formatter.write_text("** Export **")
+        formatter.write_text(
+            "When exporting photos, osxphotos creates a database in the top-level "
+            + f"export folder called '{OSXPHOTOS_EXPORT_DB}'.  This database preserves state information "
+            + "used for determining which files need to be updated when run with --update.  It is recommended "
+            + "that if you later move the export folder tree you also move the database file."
+        )
+        formatter.write("\n")
+        formatter.write_text(
+            "The --update option will only copy new or updated files from the library "
+            + "to the export folder.  If a file is changed in the export folder (for example, you edited the "
+            + "exported image), osxphotos will detect this as a difference and re-export the original image "
+            + "from the library thus overwriting the changes.  If using --update, the exported library "
+            + "should be treated as a backup, not a working copy where you intend to make changes. "
+        )
+        formatter.write("\n")
+        formatter.write_text(
+            "Note: The number of files reported for export and the number actually exported "
+            + "may differ due to live photos, associated RAW images, and edited photos which are reported "
+            + "in the total photos exported."
+        )
+        formatter.write("\n")
+        formatter.write_text(
+            "Implementation note: To determine which files need to be updated, "
+            + f"osxphotos stores file signature information in the '{OSXPHOTOS_EXPORT_DB}' database. "
+            + "The signature includes size, modification time, and filename.  In order to minimize "
+            + "run time, --update does not do a full comparison (diff) of the files nor does it compare "
+            + "hashes of the files.  In normal usage, this is sufficient for updating the library. "
+            + "You can always run export without the --update option to re-export the entire library thus "
+            + f"rebuilding the '{OSXPHOTOS_EXPORT_DB}' database."
+        )
+
+        formatter.write("\n\n")
+        formatter.write_text("** Templating System **")
        formatter.write("\n")
        formatter.write_text(
            "With the --directory option you may specify a template for the "
@@ -89,7 +144,7 @@ class ExportCommand(click.Command):
        )
        formatter.write("\n")
        formatter.write_text(
-                        "The templating system may also be used with the --keyword-template option "
+            "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}"'
@@ -778,6 +833,7 @@ def query(
    ]
    # print help if no non-exclusive term or a double exclusive term is given
    if not any(nonexclusive + [b ^ n for b, n in exclusive]):
+        click.echo("Incompatible query options", err=True)
        click.echo(cli.commands["query"].get_help(ctx), err=True)
        return

@@ -858,12 +914,23 @@ def query(

@cli.command(cls=ExportCommand)
@DB_OPTION
-@click.option("--verbose", "-V", is_flag=True, help="Print verbose output.")
+@click.option("--verbose", "-V", "verbose_", is_flag=True, help="Print verbose output.")
@query_options
+@click.option(
+    "--update",
+    is_flag=True,
+    help="Only export new or updated files. See notes below on export and --update.",
+)
+@click.option(
+    "--dry-run",
+    is_flag=True,
+    help="Dry run (test) the export but don't actually export any files; most useful with --verbose",
+)
@click.option(
    "--export-as-hardlink",
    is_flag=True,
-    help="Hardlink files instead of copying them. ",
+    help="Hardlink files instead of copying them.  "
+    "Cannot be used with --exiftool which creates copies of the files with embedded EXIF data.",
 )
@click.option(
    "--overwrite",
@@ -961,7 +1028,8 @@ def query(
    is_flag=True,
    help="Use exiftool to write metadata directly to exported photos. "
    "To use this option, exiftool must be installed and in the path.  "
-    "exiftool may be installed from https://exiftool.org/",
+    "exiftool may be installed from https://exiftool.org/.  "
+    "Cannot be used with --export-as-hardlink.",
 )
@click.option(
    "--directory",
@@ -1008,7 +1076,9 @@ def export(
    not_shared,
    from_date,
    to_date,
-    verbose,
+    verbose_,
+    update,
+    dry_run,
    export_as_hardlink,
    overwrite,
    export_by_date,
@@ -1062,6 +1132,9 @@ def export(
        to modify this behavior. 
    """

+    global VERBOSE
+    VERBOSE = True if verbose_ else False
+
    if not os.path.isdir(dest):
        sys.exit("DEST must be valid path")

@@ -1082,9 +1155,11 @@ def export(
        (selfie, not_selfie),
        (panorama, not_panorama),
        (export_by_date, directory),
+        (export_as_hardlink, exiftool),
        (any(place), no_place),
    ]
    if any([all(bb) for bb in exclusive]):
+        click.echo("Incompatible export options", err=True)
        click.echo(cli.commands["export"].get_help(ctx), err=True)
        return

@@ -1126,6 +1201,16 @@ def export(
        _list_libraries()
        return

+    # open export database and assign copy/link/unlink functions
+    if dry_run:
+        export_db = ExportDBInMemory(os.path.join(dest, OSXPHOTOS_EXPORT_DB))
+        # echo = functools.partial(click.echo, err=True)
+        # fileutil = FileUtilNoOp(verbose=echo)
+        fileutil = FileUtilNoOp
+    else:
+        export_db = ExportDB(os.path.join(dest, OSXPHOTOS_EXPORT_DB))
+        fileutil = FileUtil
+
    photos = _query(
        db=db,
        keyword=keyword,
@@ -1180,6 +1265,11 @@ def export(
        no_place=no_place,
    )

+    results_exported = []
+    results_new = []
+    results_updated = []
+    results_skipped = []
+    results_exif_updated = []
    if photos:
        if export_bursts:
            # add the burst_photos to the export set
@@ -1191,59 +1281,98 @@ def export(
        num_photos = len(photos)
        photo_str = "photos" if num_photos > 1 else "photo"
        click.echo(f"Exporting {num_photos} {photo_str} to {dest}...")
-        if not verbose:
+        start_time = time.perf_counter()
+        if not verbose_:
            # show progress bar
            with click.progressbar(photos) as bar:
                for p in bar:
-                    export_photo(
-                        p,
-                        dest,
-                        verbose,
-                        export_by_date,
-                        sidecar,
-                        export_as_hardlink,
-                        overwrite,
-                        export_edited,
-                        original_name,
-                        export_live,
-                        download_missing,
-                        exiftool,
-                        directory,
-                        no_extended_attributes,
-                        export_raw,
-                        album_keyword,
-                        person_keyword,
-                        keyword_template,
+                    results = export_photo(
+                        photo=p,
+                        dest=dest,
+                        verbose_=verbose_,
+                        export_by_date=export_by_date,
+                        sidecar=sidecar,
+                        update=update,
+                        export_as_hardlink=export_as_hardlink,
+                        overwrite=overwrite,
+                        export_edited=export_edited,
+                        original_name=original_name,
+                        export_live=export_live,
+                        download_missing=download_missing,
+                        exiftool=exiftool,
+                        directory=directory,
+                        no_extended_attributes=no_extended_attributes,
+                        export_raw=export_raw,
+                        album_keyword=album_keyword,
+                        person_keyword=person_keyword,
+                        keyword_template=keyword_template,
+                        export_db=export_db,
+                        fileutil=fileutil,
+                        dry_run = dry_run,
                    )
+                    results_exported.extend(results.exported)
+                    results_new.extend(results.new)
+                    results_updated.extend(results.updated)
+                    results_skipped.extend(results.skipped)
+                    results_exif_updated.extend(results.exif_updated)
        else:
            for p in photos:
-                export_paths = export_photo(
-                    p,
-                    dest,
-                    verbose,
-                    export_by_date,
-                    sidecar,
-                    export_as_hardlink,
-                    overwrite,
-                    export_edited,
-                    original_name,
-                    export_live,
-                    download_missing,
-                    exiftool,
-                    directory,
-                    no_extended_attributes,
-                    export_raw,
-                    album_keyword,
-                    person_keyword,
-                    keyword_template,
+                results = export_photo(
+                    photo=p,
+                    dest=dest,
+                    verbose_=verbose_,
+                    export_by_date=export_by_date,
+                    sidecar=sidecar,
+                    update=update,
+                    export_as_hardlink=export_as_hardlink,
+                    overwrite=overwrite,
+                    export_edited=export_edited,
+                    original_name=original_name,
+                    export_live=export_live,
+                    download_missing=download_missing,
+                    exiftool=exiftool,
+                    directory=directory,
+                    no_extended_attributes=no_extended_attributes,
+                    export_raw=export_raw,
+                    album_keyword=album_keyword,
+                    person_keyword=person_keyword,
+                    keyword_template=keyword_template,
+                    export_db=export_db,
+                    fileutil=fileutil,
+                    dry_run=dry_run,
                )
-                if export_paths:
-                    click.echo(f"Exported {p.filename} to {export_paths}")
-                else:
-                    click.echo(f"Did not export missing file {p.filename}")
+                results_exported.extend(results.exported)
+                results_new.extend(results.new)
+                results_updated.extend(results.updated)
+                results_skipped.extend(results.skipped)
+                results_exif_updated.extend(results.exif_updated)
+
+        stop_time = time.perf_counter()
+        # print summary results
+        if not update:
+            photo_str = "photos" if len(results_exported) != 1 else "photo"
+            click.echo(f"Exported: {len(results_exported)} {photo_str}")
+            click.echo(f"Elapsed time: {stop_time-start_time} seconds")
+        else:
+            photo_str_new = "photos" if len(results_new) != 1 else "photo"
+            photo_str_updated = "photos" if len(results_new) != 1 else "photo"
+            photo_str_skipped = "photos" if len(results_skipped) != 1 else "photo"
+            photo_str_exif_updated = (
+                "photos" if len(results_exif_updated) != 1 else "photo"
+            )
+            click.echo(
+                f"Exported: {len(results_new)} {photo_str_new}, "
+                + f"updated: {len(results_updated)} {photo_str_updated}, "
+                + f"skipped: {len(results_skipped)} {photo_str_skipped}, "
+                + f"updated EXIF data: {len(results_exif_updated)} {photo_str_exif_updated}"
+            )
+            click.echo(f"Elapsed time: {stop_time-start_time} seconds")
+
    else:
        click.echo("Did not find any photos to export")

+    export_db.close()
+

@cli.command()
@click.argument("topic", default=None, required=False, nargs=1)
@@ -1608,29 +1737,33 @@ def _query(


 def export_photo(
-    photo,
-    dest,
-    verbose,
-    export_by_date,
-    sidecar,
-    export_as_hardlink,
-    overwrite,
-    export_edited,
-    original_name,
-    export_live,
-    download_missing,
-    exiftool,
-    directory,
-    no_extended_attributes,
-    export_raw,
-    album_keyword,
-    person_keyword,
-    keyword_template,
+    photo=None,
+    dest=None,
+    verbose_=None,
+    export_by_date=None,
+    sidecar=None,
+    update=None,
+    export_as_hardlink=None,
+    overwrite=None,
+    export_edited=None,
+    original_name=None,
+    export_live=None,
+    download_missing=None,
+    exiftool=None,
+    directory=None,
+    no_extended_attributes=None,
+    export_raw=None,
+    album_keyword=None,
+    person_keyword=None,
+    keyword_template=None,
+    export_db=None,
+    fileutil=FileUtil,
+    dry_run=None,
 ):
    """ Helper function for export that does the actual export
        photo: PhotoInfo object
        dest: destination path as string
-        verbose: boolean; print verbose output
+        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
@@ -1646,8 +1779,13 @@ def export_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
+        export_db: export database instance compatible with ExportDB_ABC
+        fileutil: file util class compatible with FileUtilABC
+        dry_run: boolean; if True, doesn't actually export or update any files
        returns list of path(s) of exported photo or None if photo was missing 
    """
+    global VERBOSE
+    VERBOSE = True if verbose_ else False

    # Can export to multiple paths
    # Start with single path [dest] but direcotry and export_by_date will modify dest_paths
@@ -1655,21 +1793,21 @@ def export_photo(

    if not download_missing:
        if photo.ismissing:
-            space = " " if not verbose else ""
-            click.echo(f"{space}Skipping missing photo {photo.filename}")
-            return None
+            space = " " if not verbose_ else ""
+            verbose(f"{space}Skipping missing photo {photo.filename}")
+            return ExportResults([], [], [], [], [])
        elif not os.path.exists(photo.path):
-            space = " " if not verbose else ""
-            click.echo(
+            space = " " if not verbose_ else ""
+            verbose(
                f"{space}WARNING: file {photo.path} is missing but ismissing=False, "
                f"skipping {photo.filename}"
            )
-            return None
+            return ExportResults([], [], [], [], [])
    elif photo.ismissing and not photo.iscloudasset or not photo.incloud:
-        click.echo(
+        verbose(
            f"Skipping missing {photo.filename}: not iCloud asset or missing from cloud"
        )
-        return None
+        return ExportResults([], [], [], [], [])

    filename = None
    if original_name:
@@ -1677,12 +1815,13 @@ def export_photo(
    else:
        filename = photo.filename

-    if verbose:
-        click.echo(f"Exporting {photo.filename} as {filename}")
+    verbose(f"Exporting {photo.filename} as {filename}")

    if export_by_date:
-        date_created = photo.date.timetuple()
-        dest_path = create_path_by_date(dest, date_created)
+        date_created = DateTimeFormatter(photo.date)
+        dest_path = os.path.join(dest, date_created.year, date_created.mm, date_created.dd)
+        if not dry_run and not os.path.isdir(dest_path):
+            os.makedirs(dest_path)
        dest_paths = [dest_path]
    elif directory:
        # got a directory template, render it and check results are valid
@@ -1698,7 +1837,7 @@ def export_photo(
            dest_path = os.path.join(dest, dirname)
            if not is_valid_filepath(dest_path, platform="auto"):
                raise ValueError(f"Invalid file path: '{dest_path}'")
-            if not os.path.isdir(dest_path):
+            if not dry_run and not os.path.isdir(dest_path):
                os.makedirs(dest_path)
            dest_paths.append(dest_path)

@@ -1716,9 +1855,13 @@ def export_photo(
    )

    # export the photo to each path in dest_paths
-    photo_paths = []
+    results_exported = []
+    results_new = []
+    results_updated = []
+    results_skipped = []
+    results_exif_updated = []
    for dest_path in dest_paths:
-        photo_path = photo.export(
+        export_results = photo.export2(
            dest_path,
            filename,
            sidecar_json=sidecar_json,
@@ -1733,8 +1876,27 @@ def export_photo(
            use_albums_as_keywords=album_keyword,
            use_persons_as_keywords=person_keyword,
            keyword_template=keyword_template,
-        )[0]
-        photo_paths.append(photo_path)
+            update=update,
+            export_db=export_db,
+            fileutil=fileutil,
+            dry_run = dry_run,
+        )
+
+        results_exported.extend(export_results.exported)
+        results_new.extend(export_results.new)
+        results_updated.extend(export_results.updated)
+        results_skipped.extend(export_results.skipped)
+        results_exif_updated.extend(export_results.exif_updated)
+
+        if verbose_:
+            for exported in export_results.exported:
+                verbose(f"Exported {exported}")
+            for new in export_results.new:
+                verbose(f"Exported new file {new}")
+            for updated in export_results.updated:
+                verbose(f"Exported updated file {updated}")
+            for skipped in export_results.skipped:
+                verbose(f"Skipped up to date file {skipped}")

        # if export-edited, also export the edited version
        # verify the photo has adjustments and valid path to avoid raising an exception
@@ -1743,7 +1905,7 @@ def export_photo(
            # try to download with Photos
            use_photos_export = download_missing and photo.path_edited is None
            if not download_missing and photo.path_edited is None:
-                click.echo(f"Skipping missing edited photo for {filename}")
+                verbose(f"Skipping missing edited photo for {filename}")
            else:
                edited_name = pathlib.Path(filename)
                # check for correct edited suffix
@@ -1754,11 +1916,8 @@ def export_photo(
                    # will be corrected by use_photos_export
                    edited_suffix = pathlib.Path(photo.filename).suffix
                edited_name = f"{edited_name.stem}_edited{edited_suffix}"
-                if verbose:
-                    click.echo(
-                        f"Exporting edited version of {filename} as {edited_name}"
-                    )
-                photo.export(
+                verbose(f"Exporting edited version of {filename} as {edited_name}")
+                export_results_edited = photo.export2(
                    dest_path,
                    edited_name,
                    sidecar_json=sidecar_json,
@@ -1772,9 +1931,35 @@ def export_photo(
                    use_albums_as_keywords=album_keyword,
                    use_persons_as_keywords=person_keyword,
                    keyword_template=keyword_template,
+                    update=update,
+                    export_db=export_db,
+                    fileutil=fileutil,
+                    dry_run = dry_run,
                )

-    return photo_paths
+                results_exported.extend(export_results_edited.exported)
+                results_new.extend(export_results_edited.new)
+                results_updated.extend(export_results_edited.updated)
+                results_skipped.extend(export_results_edited.skipped)
+                results_exif_updated.extend(export_results_edited.exif_updated)
+
+                if verbose_:
+                    for exported in export_results_edited.exported:
+                        verbose(f"Exported {exported}")
+                    for new in export_results_edited.new:
+                        verbose(f"Exported new file {new}")
+                    for updated in export_results_edited.updated:
+                        verbose(f"Exported updated file {updated}")
+                    for skipped in export_results_edited.skipped:
+                        verbose(f"Skipped up to date file {skipped}")
+
+    return ExportResults(
+        results_exported,
+        results_new,
+        results_updated,
+        results_skipped,
+        results_exif_updated,
+    )


 if __name__ == "__main__":
--- a/osxphotos/_export_db.py
+++ b/osxphotos/_export_db.py
@@ -0,0 +1,500 @@
+""" Helper class for managing a database used by 
+    PhotoInfo.export for tracking state of exports and updates
+"""
+
+import datetime
+import logging
+import os
+import pathlib
+import sqlite3
+import sys
+from abc import ABC, abstractmethod
+from io import StringIO
+from sqlite3 import Error
+
+from ._version import __version__
+
+OSXPHOTOS_EXPORTDB_VERSION = "1.0"
+
+
+class ExportDB_ABC(ABC):
+    """ abstract base class for ExportDB """
+    @abstractmethod
+    def get_uuid_for_file(self, filename):
+        pass
+
+    @abstractmethod
+    def set_uuid_for_file(self, filename, uuid):
+        pass
+
+    @abstractmethod
+    def set_stat_orig_for_file(self, filename, stats):
+        pass
+
+    @abstractmethod
+    def get_stat_orig_for_file(self, filename):
+        pass
+
+    @abstractmethod
+    def set_stat_exif_for_file(self, filename, stats):
+        pass
+
+    @abstractmethod
+    def get_stat_exif_for_file(self, filename):
+        pass
+
+    @abstractmethod
+    def get_info_for_uuid(self, uuid):
+        pass
+
+    @abstractmethod
+    def set_info_for_uuid(self, uuid, info):
+        pass
+
+    @abstractmethod
+    def get_exifdata_for_file(self, uuid):
+        pass
+
+    @abstractmethod
+    def set_exifdata_for_file(self, uuid, exifdata):
+        pass
+
+    @abstractmethod
+    def set_data(self, filename, uuid, orig_stat, exif_stat, info_json, exif_json):
+        pass
+
+
+class ExportDBNoOp(ExportDB_ABC):
+    """ An ExportDB with NoOp methods """
+
+    def get_uuid_for_file(self, filename):
+        pass
+
+    def set_uuid_for_file(self, filename, uuid):
+        pass
+
+    def set_stat_orig_for_file(self, filename, stats):
+        pass
+
+    def get_stat_orig_for_file(self, filename):
+        pass
+
+    def set_stat_exif_for_file(self, filename, stats):
+        pass
+
+    def get_stat_exif_for_file(self, filename):
+        pass
+
+    def get_info_for_uuid(self, uuid):
+        pass
+
+    def set_info_for_uuid(self, uuid, info):
+        pass
+
+    def get_exifdata_for_file(self, uuid):
+        pass
+
+    def set_exifdata_for_file(self, uuid, exifdata):
+        pass
+
+    def set_data(self, filename, uuid, orig_stat, exif_stat, info_json, exif_json):
+        pass
+
+
+class ExportDB(ExportDB_ABC):
+    """ Interface to sqlite3 database used to store state information for osxphotos export command """
+
+    def __init__(self, dbfile):
+        """ dbfile: path to osxphotos export database file """
+        self._dbfile = dbfile
+        # _path is parent of the database
+        # all files referenced by get_/set_uuid_for_file will be converted to
+        # relative paths to this parent _path
+        # this allows the entire export tree to be moved to a new disk/location
+        # whilst preserving the UUID to filename mappping
+        self._path = pathlib.Path(dbfile).parent
+        self._conn = self._open_export_db(dbfile)
+        self._insert_run_info()
+
+    def get_uuid_for_file(self, filename):
+        """ query database for filename and return UUID
+            returns None if filename not found in database
+        """
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        logging.debug(f"get_uuid: {filename}")
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                f"SELECT uuid FROM files WHERE filepath_normalized = ?", (filename,)
+            )
+            results = c.fetchone()
+            uuid = results[0] if results else None
+        except Error as e:
+            logging.warning(e)
+            uuid = None
+
+        logging.debug(f"get_uuid: {uuid}")
+        return uuid
+
+    def set_uuid_for_file(self, filename, uuid):
+        """ set UUID of filename to uuid in the database """
+        filename = str(pathlib.Path(filename).relative_to(self._path))
+        filename_normalized = filename.lower()
+        logging.debug(f"set_uuid: {filename} {uuid}")
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                f"INSERT OR REPLACE INTO files(filepath, filepath_normalized, uuid) VALUES (?, ?, ?);",
+                (filename, filename_normalized, uuid),
+            )
+            conn.commit()
+        except Error as e:
+            logging.warning(e)
+
+    def set_stat_orig_for_file(self, filename, stats):
+        """ set stat info for filename
+            filename: filename to set the stat info for
+            stat: a tuple of length 3: mode, size, mtime """
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        if len(stats) != 3:
+            raise ValueError(f"expected 3 elements for stat, got {len(stats)}")
+
+        logging.debug(f"set_stat_orig_for_file: {filename} {stats}")
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                "UPDATE files "
+                + "SET orig_mode = ?, orig_size = ?, orig_mtime = ? "
+                + "WHERE filepath_normalized = ?;",
+                (*stats, filename),
+            )
+            conn.commit()
+        except Error as e:
+            logging.warning(e)
+
+    def get_stat_orig_for_file(self, filename):
+        """ get stat info for filename
+            returns: tuple of (mode, size, mtime) 
+        """
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                "SELECT orig_mode, orig_size, orig_mtime FROM files WHERE filepath_normalized = ?",
+                (filename,),
+            )
+            results = c.fetchone()
+            stats = results[0:3] if results else None
+        except Error as e:
+            logging.warning(e)
+            stats = (None, None, None)
+
+        logging.debug(f"get_stat_orig_for_file: {stats}")
+        return stats
+
+    def set_stat_exif_for_file(self, filename, stats):
+        """ set stat info for filename (after exiftool has updated it)
+            filename: filename to set the stat info for
+            stat: a tuple of length 3: mode, size, mtime """
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        if len(stats) != 3:
+            raise ValueError(f"expected 3 elements for stat, got {len(stats)}")
+
+        logging.debug(f"set_stat_exif_for_file: {filename} {stats}")
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                "UPDATE files "
+                + "SET exif_mode = ?, exif_size = ?, exif_mtime = ? "
+                + "WHERE filepath_normalized = ?;",
+                (*stats, filename),
+            )
+            conn.commit()
+        except Error as e:
+            logging.warning(e)
+
+    def get_stat_exif_for_file(self, filename):
+        """ get stat info for filename (after exiftool has updated it)
+            returns: tuple of (mode, size, mtime) 
+        """
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                "SELECT exif_mode, exif_size, exif_mtime FROM files WHERE filepath_normalized = ?",
+                (filename,),
+            )
+            results = c.fetchone()
+            stats = results[0:3] if results else None
+        except Error as e:
+            logging.warning(e)
+            stats = (None, None, None)
+
+        logging.debug(f"get_stat_exif_for_file: {stats}")
+        return stats
+
+    def get_info_for_uuid(self, uuid):
+        """ returns the info JSON struct for a UUID """
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute("SELECT json_info FROM info WHERE uuid = ?", (uuid,))
+            results = c.fetchone()
+            info = results[0] if results else None
+        except Error as e:
+            logging.warning(e)
+            info = None
+
+        logging.debug(f"get_info: {uuid}, {info}")
+        return info
+
+    def set_info_for_uuid(self, uuid, info):
+        """ sets the info JSON struct for a UUID """
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                "INSERT OR REPLACE INTO info(uuid, json_info) VALUES (?, ?);",
+                (uuid, info),
+            )
+            conn.commit()
+        except Error as e:
+            logging.warning(e)
+
+        logging.debug(f"set_info: {uuid}, {info}")
+
+    def get_exifdata_for_file(self, filename):
+        """ returns the exifdata JSON struct for a file """
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                "SELECT json_exifdata FROM exifdata WHERE filepath_normalized = ?",
+                (filename,),
+            )
+            results = c.fetchone()
+            exifdata = results[0] if results else None
+        except Error as e:
+            logging.warning(e)
+            exifdata = None
+
+        logging.debug(f"get_exifdata: {filename}, {exifdata}")
+        return exifdata
+
+    def set_exifdata_for_file(self, filename, exifdata):
+        """ sets the exifdata JSON struct for a file """
+        filename = str(pathlib.Path(filename).relative_to(self._path)).lower()
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                "INSERT OR REPLACE INTO exifdata(filepath_normalized, json_exifdata) VALUES (?, ?);",
+                (filename, exifdata),
+            )
+            conn.commit()
+        except Error as e:
+            logging.warning(e)
+
+        logging.debug(f"set_exifdata: {filename}, {exifdata}")
+
+    def set_data(self, filename, uuid, orig_stat, exif_stat, info_json, exif_json):
+        """ sets all the data for file and uuid at once 
+            calls set_uuid_for_file
+                  set_info_for_uuid
+                  set_stat_orig_for_file
+                  set_stat_exif_for_file
+                  set_exifdata_for_file        
+        """
+        self.set_uuid_for_file(filename, uuid)
+        self.set_info_for_uuid(uuid, info_json)
+        self.set_stat_orig_for_file(filename, orig_stat)
+        self.set_stat_exif_for_file(filename, exif_stat)
+        self.set_exifdata_for_file(filename, exif_json)
+
+    def close(self):
+        """ close the database connection """
+        try:
+            self._conn.close()
+        except Error as e:
+            logging.warning(e)
+
+    def _open_export_db(self, dbfile):
+        """ open export database and return a db connection
+            if dbfile does not exist, will create and initialize the database 
+            returns: connection to the database 
+        """
+
+        if not os.path.isfile(dbfile):
+            logging.debug(f"dbfile {dbfile} doesn't exist, creating it")
+            conn = self._get_db_connection(dbfile)
+            if conn:
+                self._create_db_tables(conn)
+            else:
+                raise Exception("Error getting connection to database {dbfile}")
+        else:
+            logging.debug(f"dbfile {dbfile} exists, opening it")
+            conn = self._get_db_connection(dbfile)
+
+        return conn
+
+    def _get_db_connection(self, dbfile):
+        """ return db connection to dbname """
+        try:
+            conn = sqlite3.connect(dbfile)
+        except Error as e:
+            logging.warning(e)
+            conn = None
+
+        return conn
+
+    def _create_db_tables(self, conn):
+        """ create (if not already created) the necessary db tables for the export database
+            conn: sqlite3 db connection 
+        """
+        sql_commands = {
+            "sql_version_table": """ CREATE TABLE IF NOT EXISTS version (
+                                id INTEGER PRIMARY KEY,
+                                osxphotos TEXT,
+                                exportdb TEXT 
+                                ); """,
+            "sql_files_table": """ CREATE TABLE IF NOT EXISTS files (
+                              id INTEGER PRIMARY KEY,
+                              filepath TEXT NOT NULL,
+                              filepath_normalized TEXT NOT NULL,
+                              uuid TEXT,
+                              orig_mode INTEGER,
+                              orig_size INTEGER,
+                              orig_mtime REAL,
+                              exif_mode INTEGER,
+                              exif_size INTEGER,
+                              exif_mtime REAL
+                              ); """,
+            "sql_runs_table": """ CREATE TABLE IF NOT EXISTS runs (
+                             id INTEGER PRIMARY KEY,
+                             datetime TEXT,
+                             python_path TEXT,
+                             script_name TEXT,
+                             args TEXT,
+                             cwd TEXT 
+                             ); """,
+            "sql_info_table": """ CREATE TABLE IF NOT EXISTS info (
+                             id INTEGER PRIMARY KEY,
+                             uuid text NOT NULL,
+                             json_info JSON 
+                             ); """,
+            "sql_exifdata_table": """ CREATE TABLE IF NOT EXISTS exifdata (
+                             id INTEGER PRIMARY KEY,
+                             filepath_normalized TEXT NOT NULL,
+                             json_exifdata JSON 
+                             ); """,
+            "sql_files_idx": """ CREATE UNIQUE INDEX idx_files_filepath_normalized on files (filepath_normalized); """,
+            "sql_info_idx": """ CREATE UNIQUE INDEX idx_info_uuid on info (uuid); """,
+            "sql_exifdata_idx": """ CREATE UNIQUE INDEX idx_exifdata_filename on exifdata (filepath_normalized); """,
+        }
+        try:
+            c = conn.cursor()
+            for cmd in sql_commands.values():
+                c.execute(cmd)
+            c.execute(
+                "INSERT INTO version(osxphotos, exportdb) VALUES (?, ?);",
+                (__version__, OSXPHOTOS_EXPORTDB_VERSION),
+            )
+            conn.commit()
+        except Error as e:
+            logging.warning(e)
+
+    def __del__(self):
+        """ ensure the database connection is closed """
+        if self._conn:
+            try:
+                self._conn.close()
+            except Error as e:
+                logging.warning(e)
+
+    def _insert_run_info(self):
+        dt = datetime.datetime.utcnow().isoformat()
+        python_path = sys.executable
+        cmd = sys.argv[0]
+        if len(sys.argv) > 1:
+            args = " ".join(sys.argv[1:])
+        else:
+            args = ""
+        cwd = os.getcwd()
+        conn = self._conn
+        try:
+            c = conn.cursor()
+            c.execute(
+                f"INSERT INTO runs (datetime, python_path, script_name, args, cwd) VALUES (?, ?, ?, ?, ?)",
+                (dt, python_path, cmd, args, cwd),
+            )
+            conn.commit()
+        except Error as e:
+            logging.warning(e)
+
+
+class ExportDBInMemory(ExportDB):
+    """ In memory version of ExportDB
+        Copies the on-disk database into memory so it may be operated on without 
+        modifying the on-disk verison 
+    """
+
+    def init(self, dbfile):
+        self._dbfile = dbfile
+        # _path is parent of the database
+        # all files referenced by get_/set_uuid_for_file will be converted to
+        # relative paths to this parent _path
+        # this allows the entire export tree to be moved to a new disk/location
+        # whilst preserving the UUID to filename mappping
+        self._path = pathlib.Path(dbfile).parent
+        self._conn = self._open_export_db(dbfile)
+        self._insert_run_info()
+
+    def _open_export_db(self, dbfile):
+        """ open export database and return a db connection
+            if dbfile does not exist, will create and initialize the database 
+            returns: connection to the database 
+        """
+        if not os.path.isfile(dbfile):
+            logging.debug(f"dbfile {dbfile} doesn't exist, creating in memory version")
+            conn = self._get_db_connection()
+            if conn:
+                self._create_db_tables(conn)
+            else:
+                raise Exception("Error getting connection to in-memory database")
+        else:
+            logging.debug(f"dbfile {dbfile} exists, opening it and copying to memory")
+            try:
+                conn = sqlite3.connect(dbfile)
+            except Error as e:
+                logging.warning(e)
+                raise e
+            
+            tempfile = StringIO()
+            for line in conn.iterdump():
+                tempfile.write("%s\n" % line)
+            conn.close()
+            tempfile.seek(0)
+
+            # Create a database in memory and import from tempfile
+            conn = sqlite3.connect(":memory:")
+            conn.cursor().executescript(tempfile.read())
+            conn.commit()
+
+        return conn
+
+    def _get_db_connection(self):
+        """ return db connection to in memory database """
+        try:
+            conn = sqlite3.connect(":memory:")
+        except Error as e:
+            logging.warning(e)
+            conn = None
+
+        return conn
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.28.19"
+__version__ = "0.29.5"
--- a/osxphotos/datetime_formatter.py
+++ b/osxphotos/datetime_formatter.py
@@ -45,6 +45,18 @@ class DateTimeFormatter:
        mon = f"{self.dt.strftime('%b')}"
        return mon

+    @property
+    def dd(self):
+        """ 2-digit day of the month """
+        dd = f"{self.dt.strftime('%d')}"
+        return dd
+
+    @property
+    def dow(self):
+        """ Day of week as locale's name """
+        dow = f"{self.dt.strftime('%A')}"
+        return dow
+
    @property
    def doy(self):
        """ Julian day of year starting from 001 """
--- a/osxphotos/fileutil.py
+++ b/osxphotos/fileutil.py
@@ -0,0 +1,175 @@
+""" FileUtil class with methods for copy, hardlink, unlink, etc. """
+
+import logging
+import os
+import pathlib
+import stat
+import subprocess
+import sys
+from abc import ABC, abstractmethod
+
+
+class FileUtilABC(ABC):
+    """ Abstract base class for FileUtil """
+    @classmethod
+    @abstractmethod
+    def hardlink(cls, src, dest):
+        pass
+
+    @classmethod
+    @abstractmethod
+    def copy(cls, src, dest, norsrc=False):
+        pass
+
+    @classmethod
+    @abstractmethod
+    def unlink(cls, dest):
+        pass
+
+    @classmethod
+    @abstractmethod
+    def cmp_sig(cls, file1, file2):
+        pass
+
+    @classmethod
+    @abstractmethod
+    def file_sig(cls, file1):
+        pass
+
+
+class FileUtilMacOS(FileUtilABC):
+    """ Various file utilities """
+    @classmethod
+    def hardlink(cls, 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"os.link returned error: {e}")
+            raise e
+
+    @classmethod
+    def copy(cls, src, dest, norsrc=False):
+        """ Copies a file from src path to dest path 
+            src: source path as string 
+            dest: destination path as string
+            norsrc: (bool) if True, uses --norsrc flag with ditto so it will not copy
+                    resource fork or extended attributes.  May be useful on volumes that
+                    don't work with extended attributes (likely only certain SMB mounts)
+                    default is False
+            Uses ditto to perform copy; will silently overwrite dest if it exists
+            Raises exception if copy 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 norsrc:
+            command = ["/usr/bin/ditto", "--norsrc", src, dest]
+        else:
+            command = ["/usr/bin/ditto", src, dest]
+
+        # if error on copy, subprocess will raise CalledProcessError
+        try:
+            result = subprocess.run(command, check=True, stderr=subprocess.PIPE)
+        except subprocess.CalledProcessError as e:
+            logging.critical(
+                f"ditto returned error: {e.returncode} {e.stderr.decode(sys.getfilesystemencoding()).rstrip()}"
+            )
+            raise e
+
+        return result.returncode
+
+    @classmethod
+    def unlink(cls, filepath):
+        """ unlink filepath; if it's pathlib.Path, use Path.unlink, otherwise use os.unlink """
+        if isinstance(filepath, pathlib.Path):
+            filepath.unlink()
+        else:
+            os.unlink(filepath)
+
+    @classmethod
+    def cmp_sig(cls, f1, s2):
+        """Compare file f1 to signature s2.
+        Arguments:
+        f1 --  File name
+        s2 -- stats as returned by sig
+
+        Return value:
+        True if the files are the same, False otherwise.
+        """
+
+        if not s2:
+            return False
+
+        s1 = cls._sig(os.stat(f1))
+
+        if s1[0] != stat.S_IFREG or s2[0] != stat.S_IFREG:
+            return False
+        if s1 == s2:
+            return True
+        return False
+
+    @classmethod
+    def file_sig(cls, f1):
+        """ return os.stat signature for file f1 """
+        return cls._sig(os.stat(f1))
+
+    @staticmethod
+    def _sig(st):
+        return (stat.S_IFMT(st.st_mode), st.st_size, st.st_mtime)
+
+
+class FileUtil(FileUtilMacOS):
+    """ Various file utilities """
+    pass
+
+class FileUtilNoOp(FileUtil):
+    """ No-Op implementation of FileUtil for testing / dry-run mode
+        all methods with exception of cmp_sig and file_cmp are no-op
+        cmp_sig functions as FileUtil.cmp_sig does
+        file_cmp returns mock data
+    """
+    @staticmethod
+    def noop(*args):
+        pass
+
+    verbose = noop
+
+    def __new__(cls, verbose=None):
+        if verbose:
+            if callable(verbose):
+                cls.verbose = verbose
+            else:
+                raise ValueError(f"verbose {verbose} not callable")
+        return super(FileUtilNoOp, cls).__new__(cls) 
+
+    @classmethod
+    def hardlink(cls, src, dest):
+        cls.verbose(f"hardlink: {src} {dest}")
+
+    @classmethod
+    def copy(cls, src, dest, norsrc=False):
+        cls.verbose(f"copy: {src} {dest}")
+        
+    @classmethod
+    def unlink(cls, dest):
+        cls.verbose(f"unlink: {dest}")
+
+    @classmethod
+    def file_sig(cls, file1):
+        cls.verbose(f"file_sig: {file1}")
+        return (42, 42, 42)
--- a/osxphotos/photoinfo/init.py
+++ b/osxphotos/photoinfo/init.py
@@ -4,5 +4,6 @@ Represents a single photo in the Photos library and provides access to the photo
 PhotosDB.photos() returns a list of PhotoInfo objects
 """

-from .photoinfo import PhotoInfo
 from ._photoinfo_exifinfo import ExifInfo
+from ._photoinfo_export import ExportResults
+from .photoinfo import PhotoInfo
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -4,6 +4,7 @@ Represents a single photo in the Photos library and provides access to the photo
 PhotosDB.photos() returns a list of PhotoInfo objects
 """

+import dataclasses
 import glob
 import json
 import logging
@@ -17,31 +18,18 @@ from datetime import timedelta, timezone
 from pprint import pformat

 import yaml
-from mako.template import Template
+
 from .._constants import (
-    _MAX_IPTC_KEYWORD_LEN,
    _MOVIE_TYPE,
-    _OSXPHOTOS_NONE_SENTINEL,
    _PHOTO_TYPE,
    _PHOTOS_4_VERSION,
    _PHOTOS_5_SHARED_PHOTO_PATH,
-    _TEMPLATE_DIR,
    _UNKNOWN_PERSON,
-    _XMP_TEMPLATE_NAME,
 )
 from ..albuminfo import AlbumInfo
 from ..datetime_formatter import DateTimeFormatter
-from ..exiftool import ExifTool
 from ..placeinfo import PlaceInfo4, PlaceInfo5
-from ..utils import (
-    _copy_file,
-    _export_photo_uuid_applescript,
-    _get_resource_loc,
-    _hardlink_file,
-    dd_to_dms_str,
-    findfiles,
-    get_preferred_uti_extension,
-)
+from ..utils import _debug, _get_resource_loc, findfiles, get_preferred_uti_extension
 from .template import (
    MULTI_VALUE_SUBSTITUTIONS,
    TEMPLATE_SUBSTITUTIONS,
@@ -64,6 +52,16 @@ class PhotoInfo:
    )
    from ._photoinfo_exifinfo import exif_info, ExifInfo
    from ._photoinfo_exiftool import exiftool
+    from ._photoinfo_export import (
+        export,
+        export2,
+        _export_photo,
+        _exiftool_json_sidecar,
+        _write_exif_data,
+        _write_sidecar,
+        _xmp_sidecar,
+        ExportResults,
+    )

    def __init__(self, db=None, uuid=None, info=None):
        self._uuid = uuid
@@ -262,7 +260,7 @@ class PhotoInfo:
            # if self._info["isMissing"] == 1:
            #     photopath = None  # path would be meaningless until downloaded

-            logging.debug(photopath)
+            # logging.debug(photopath)

        return photopath

@@ -638,307 +636,6 @@ class PhotoInfo:
            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,
-        sidecar_xmp=False,
-        use_photos_export=False,
-        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) 
-            filename: (optional): name of exported picture; if not provided, will use current filename 
-                      **NOTE**: if provided, user must ensure file extension (suffix) is correct. 
-                      For example, if photo is .CR2 file, edited image may be .jpeg.  
-                      If you provide an extension different than what the actual file is, 
-                      export will print a warning but will happily export the photo using the 
-                      incorrect file extension.  e.g. to get the extension of the edited photo, 
-                      reference PhotoInfo.path_edited
-            edited: (boolean, default=False); if True will export the edited version of the photo 
-                    (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 
-            sidecar_json: (boolean, default = False); if True will also write a json sidecar with IPTC data in format readable by exiftool
-                      sidecar filename will be dest/filename.json 
-            sidecar_xmp: (boolean, default = False); if True will also write a XMP sidecar with IPTC data 
-                      sidecar filename will be dest/filename.xmp 
-            use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
-            timeout: (int, default=120) timeout in seconds used with use_photos_export
-            exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
-            no_xattr: (boolean, default = False); if True, exports file without preserving extended attributes
-            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 = []
-
-        # check edited and raise exception trying to export edited version of
-        # photo that hasn't been edited
-        if edited and not self.hasadjustments:
-            raise ValueError(
-                "Photo does not have adjustments, cannot export edited version"
-            )
-
-        # check arguments and get destination path and filename (if provided)
-        if filename and len(filename) > 2:
-            raise TypeError(
-                "Too many positional arguments.  Should be at most two: destination, filename."
-            )
-        else:
-            # verify destination is a valid path
-            if dest is None:
-                raise ValueError("Destination must not be None")
-            elif not os.path.isdir(dest):
-                raise FileNotFoundError("Invalid path passed to export")
-
-            if filename and len(filename) == 1:
-                # if filename passed, use it
-                fname = filename[0]
-            else:
-                # no filename provided so use the default
-                # if edited file requested, use filename but add _edited
-                # need to use file extension from edited file as Photos saves a jpeg once edited
-                if edited and not use_photos_export:
-                    # verify we have a valid path_edited and use that to get filename
-                    if not self.path_edited:
-                        raise FileNotFoundError(
-                            "edited=True but path_edited is none; hasadjustments: "
-                            f" {self.hasadjustments}"
-                        )
-                    edited_name = pathlib.Path(self.path_edited).name
-                    edited_suffix = pathlib.Path(edited_name).suffix
-                    fname = pathlib.Path(self.filename).stem + "_edited" + edited_suffix
-                else:
-                    fname = self.filename
-
-        # check destination path
-        dest = pathlib.Path(dest)
-        fname = pathlib.Path(fname)
-        dest = dest / fname
-
-        # check extension of destination
-        if edited and self.path_edited is not None:
-            # use suffix from edited file
-            actual_suffix = pathlib.Path(self.path_edited).suffix
-        elif edited:
-            # use .jpeg as that's probably correct
-            # if edited and path_edited is None, will raise FileNotFoundError below
-            # unless use_photos_export is True
-            actual_suffix = ".jpeg"
-        else:
-            # use suffix from the non-edited file
-            actual_suffix = pathlib.Path(self.filename).suffix
-
-        # 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.lower() != actual_suffix.lower() and suffixes != [
-            ".jpeg",
-            ".jpg",
-        ]:
-            logging.warning(
-                f"Invalid destination suffix: {dest.suffix}, should be {actual_suffix}"
-            )
-
-        # check to see if file exists and if so, add (1), (2), etc until we find one that works
-        # Photos checks the stem and adds (1), (2), etc which avoids collision with sidecars
-        # e.g. exporting sidecar for file1.png and file1.jpeg
-        # if file1.png exists and exporting file1.jpeg,
-        # dest will be file1 (1).jpeg even though file1.jpeg doesn't exist to prevent sidecar collision
-        if increment and not overwrite:
-            count = 1
-            glob_str = str(dest.parent / f"{dest.stem}*")
-            dest_files = glob.glob(glob_str)
-            dest_files = [pathlib.Path(f).stem for f in dest_files]
-            dest_new = dest.stem
-            while dest_new in dest_files:
-                dest_new = f"{dest.stem} ({count})"
-                count += 1
-            dest = dest.parent / f"{dest_new}{dest.suffix}"
-
-        # if overwrite==False and #increment==False, export should fail if file exists
-        if dest.exists() and not overwrite and not increment:
-            raise FileExistsError(
-                f"destination exists ({dest}); overwrite={overwrite}, increment={increment}"
-            )
-
-        if not use_photos_export:
-            # find the source file on disk and export
-            # get path to source file and verify it's not None and is valid file
-            # TODO: how to handle ismissing or not hasadjustments and edited=True cases?
-            if edited:
-                if self.path_edited is not None:
-                    src = self.path_edited
-                else:
-                    raise FileNotFoundError(
-                        f"Cannot export edited photo if path_edited is None"
-                    )
-            else:
-                if self.ismissing:
-                    logging.warning(
-                        f"Attempting to export photo with ismissing=True: path = {self.path}"
-                    )
-
-                if self.path is not None:
-                    src = self.path
-                else:
-                    raise FileNotFoundError("Cannot export photo if path is None")
-
-            if not os.path.isfile(src):
-                raise FileNotFoundError(f"{src} does not appear to exist")
-
-            logging.debug(
-                f"exporting {src} to {dest}, overwrite={overwrite}, increment={increment}, dest exists: {dest.exists()}"
-            )
-
-            # copy the file, _copy_file uses ditto to preserve Mac extended attributes
-            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
-            if live_photo and self.live_photo:
-                live_name = dest.parent / f"{dest.stem}.mov"
-                src_live = self.path_live_photo
-
-                if src_live is not None:
-                    logging.debug(
-                        f"Exporting live photo video of {filename} as {live_name.name}"
-                    )
-                    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
-            # export live_photo .mov file?
-            live_photo = True if live_photo and self.live_photo else False
-            if edited:
-                # exported edited version and not original
-                if filename:
-                    # use filename stem provided
-                    filestem = dest.stem
-                else:
-                    # didn't get passed a filename, add _edited
-                    filestem = f"{dest.stem}_edited"
-                    dest = dest.parent / f"{filestem}.jpeg"
-
-                exported = _export_photo_uuid_applescript(
-                    self.uuid,
-                    dest.parent,
-                    filestem=filestem,
-                    original=False,
-                    edited=True,
-                    live_photo=live_photo,
-                    timeout=timeout,
-                    burst=self.burst,
-                )
-            else:
-                # export original version and not edited
-                filestem = dest.stem
-                exported = _export_photo_uuid_applescript(
-                    self.uuid,
-                    dest.parent,
-                    filestem=filestem,
-                    original=True,
-                    edited=False,
-                    live_photo=live_photo,
-                    timeout=timeout,
-                    burst=self.burst,
-                )
-
-            if exported is not None:
-                exported_files.extend(exported)
-            else:
-                logging.warning(
-                    f"Error exporting photo {self.uuid} to {dest} with use_photos_export"
-                )
-
-        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(
-                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:
-                logging.warning(f"Error writing json sidecar to {sidecar_filename}")
-                raise e
-
-        if sidecar_xmp:
-            logging.debug("writing xmp_sidecar")
-            sidecar_filename = dest.parent / pathlib.Path(f"{dest.stem}.xmp")
-            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:
-                logging.warning(f"Error writing xmp sidecar to {sidecar_filename}")
-                raise e
-
-        # if exiftool, write the metadata
-        if exiftool and exported_files:
-            for exported_file in exported_files:
-                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 render_template(self, template, none_str="_", path_sep=None):
        """ render a filename or directory template 
            template: str template 
@@ -1139,6 +836,12 @@ class PhotoInfo:
        if lookup == "created.mon":
            return DateTimeFormatter(self.date).mon

+        if lookup == "created.dd":
+            return DateTimeFormatter(self.date).dd
+
+        if lookup == "created.dow":
+            return DateTimeFormatter(self.date).dow
+
        if lookup == "created.doy":
            return DateTimeFormatter(self.date).doy

@@ -1180,6 +883,11 @@ class PhotoInfo:
                else None
            )

+        if lookup == "modified.dd":
+            return (
+                DateTimeFormatter(self.date_modified).dd if self.date_modified else None
+            )
+
        if lookup == "modified.doy":
            return (
                DateTimeFormatter(self.date_modified).doy
@@ -1273,264 +981,6 @@ class PhotoInfo:
        # 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(
-                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
-                exiftool.setvalue(exiftag, val.pop(0))
-                if val:
-                    # add any remaining items
-                    exiftool.addvalues(exiftag, *val)
-            else:
-                exiftool.setvalue(exiftag, val)
-
-    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 (may include album name, person name, or template)
-                Subject
-                PersonInImage
-                GPSLatitude, GPSLongitude
-                GPSPosition
-                GPSLatitudeRef, GPSLongitudeRef
-                DateTimeOriginal
-                OffsetTimeOriginal
-                ModifyDate """
-
-        exif = {}
-        exif["_CreatedBy"] = "osxphotos, https://github.com/RhetTbull/osxphotos"
-
-        if self.description:
-            exif["EXIF:ImageDescription"] = self.description
-            exif["XMP:Description"] = self.description
-
-        if self.title:
-            exif["XMP:Title"] = self.title
-
-        keyword_list = []
-        if self.keywords:
-            keyword_list.extend(self.keywords)
-
-        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)
-
-        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"
-            # only use Photos' keywords for subject
-            exif["XMP:Subject"] = list(self.keywords) + person_list
-
-        # if self.favorite():
-        #     exif["Rating"] = 5
-
-        (lat, lon) = self.location
-        if lat is not None and lon is not None:
-            lat_str, lon_str = dd_to_dms_str(lat, lon)
-            exif["EXIF:GPSLatitude"] = lat_str
-            exif["EXIF:GPSLongitude"] = lon_str
-            exif["Composite:GPSPosition"] = f"{lat_str}, {lon_str}"
-            lat_ref = "North" if lat >= 0 else "South"
-            lon_ref = "East" if lon >= 0 else "West"
-            exif["EXIF:GPSLatitudeRef"] = lat_ref
-            exif["EXIF:GPSLongitudeRef"] = lon_ref
-
-        # process date/time and timezone offset
-        date = self.date
-        # exiftool expects format to "2015:01:18 12:00:00"
-        datetimeoriginal = date.strftime("%Y:%m:%d %H:%M:%S")
-        offsettime = date.strftime("%z")
-        # find timezone offset in format "-04:00"
-        offset = re.findall(r"([+-]?)([\d]{2})([\d]{2})", offsettime)
-        offset = offset[0]  # findall returns list of tuples
-        offsettime = f"{offset[0]}{offset[1]}:{offset[2]}"
-        exif["EXIF:DateTimeOriginal"] = datetimeoriginal
-        exif["EXIF:OffsetTimeOriginal"] = offsettime
-
-        if self.date_modified is not None:
-            exif["EXIF:ModifyDate"] = self.date_modified.strftime("%Y:%m:%d %H:%M:%S")
-
-        json_str = json.dumps([exif])
-        return json_str
-
-    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)
-        )
-
-        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() != ""]
-        )
-        return xmp_str
-
-    def _write_sidecar(self, filename, sidecar_str):
-        """ write sidecar_str to filename
-            used for exporting sidecar info """
-        if not filename and not sidecar_str:
-            raise (
-                ValueError(
-                    f"filename {filename} and sidecar_str {sidecar_str} must not be None"
-                )
-            )
-
-        # TODO: catch exception?
-        f = open(filename, "w")
-        f.write(sidecar_str)
-        f.close()
-
    @property
    def _longitude(self):
        """ Returns longitude, in degrees """
@@ -1600,6 +1050,9 @@ class PhotoInfo:
        date_modified_iso = (
            self.date_modified.isoformat() if self.date_modified else None
        )
+        folders = {album.title: album.folder_names for album in self.album_info}
+        exif = dataclasses.asdict(self.exif_info) if self.exif_info else {}
+        place = self.place.as_dict() if self.place else {}

        pic = {
            "uuid": self.uuid,
@@ -1609,7 +1062,10 @@ class PhotoInfo:
            "description": self.description,
            "title": self.title,
            "keywords": self.keywords,
+            "labels": self.labels,
+            "keywords": self.keywords,
            "albums": self.albums,
+            "folders": folders,
            "persons": self.persons,
            "path": self.path,
            "ismissing": self.ismissing,
@@ -1640,6 +1096,8 @@ class PhotoInfo:
            "has_raw": self.has_raw,
            "uti_raw": self.uti_raw,
            "path_raw": self.path_raw,
+            "place": place,
+            "exif": exif,
        }
        return json.dumps(pic)

--- a/osxphotos/photoinfo/template.py
+++ b/osxphotos/photoinfo/template.py
@@ -26,6 +26,8 @@ TEMPLATE_SUBSTITUTIONS = {
    "{created.mm}": "2-digit month of the file creation time (zero padded)",
    "{created.month}": "Month name in user's locale of the file creation time",
    "{created.mon}": "Month abbreviation in the user's locale of the file creation time",
+    "{created.dd}": "2-digit day of the month (zero padded) of file creation time",
+    "{created.dow}": "Day of week in user's locale of the file creation time",
    "{created.doy}": "3-digit day of year (e.g Julian day) of file creation time, starting from 1 (zero padded)",
    "{modified.date}": "Photo's modification date in ISO format, e.g. '2020-03-22'",
    "{modified.year}": "4-digit year of file modification time",
@@ -33,6 +35,7 @@ TEMPLATE_SUBSTITUTIONS = {
    "{modified.mm}": "2-digit month of the file modification time (zero padded)",
    "{modified.month}": "Month name in user's locale of the file modification time",
    "{modified.mon}": "Month abbreviation in the user's locale of the file modification time",
+    "{modified.dd}": "2-digit day of the month (zero padded) of the file modification time",
    "{modified.doy}": "3-digit day of year (e.g Julian day) of file modification time, starting from 1 (zero padded)",
    "{place.name}": "Place name from the photo's reverse geolocation data, as displayed in Photos",
    "{place.country_code}": "The ISO country code from the photo's reverse geolocation data",
--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -798,14 +798,20 @@ class PhotosDB:
            # There are sometimes negative values for lastmodifieddate in the database
            # I don't know what these mean but they will raise exception in datetime if
            # not accounted for
-            if row[4] is not None and row[4] >= 0:
+            try:
                self._dbphotos[uuid]["lastmodifieddate"] = datetime.fromtimestamp(
                    row[4] + td
                )
-            else:
+            except ValueError:
+                self._dbphotos[uuid]["lastmodifieddate"] = None
+            except TypeError:
                self._dbphotos[uuid]["lastmodifieddate"] = None

-            self._dbphotos[uuid]["imageDate"] = datetime.fromtimestamp(row[5] + td)
+            try:
+                self._dbphotos[uuid]["imageDate"] = datetime.fromtimestamp(row[5] + td)
+            except ValueError:
+                self._dbphotos[uuid]["imageDate"] = datetime.date(1970, 1, 1)
+
            self._dbphotos[uuid]["mainRating"] = row[6]
            self._dbphotos[uuid]["hasAdjustments"] = row[7]
            self._dbphotos[uuid]["hasKeywords"] = row[8]
@@ -1512,12 +1518,18 @@ class PhotosDB:
            # There are sometimes negative values for lastmodifieddate in the database
            # I don't know what these mean but they will raise exception in datetime if
            # not accounted for
-            if row[4] is not None and row[4] >= 0:
+            try:
                info["lastmodifieddate"] = datetime.fromtimestamp(row[4] + td)
-            else:
+            except ValueError:
+                info["lastmodifieddate"] = None
+            except TypeError:
                info["lastmodifieddate"] = None

-            info["imageDate"] = datetime.fromtimestamp(row[5] + td)
+            try:
+                info["imageDate"] = datetime.fromtimestamp(row[5] + td)
+            except ValueError:
+                info["imageDate"] = datetime.date(1970, 1, 1)
+
            info["imageTimeZoneOffsetSeconds"] = row[6]
            info["hidden"] = row[9]
            info["favorite"] = row[10]
@@ -1926,6 +1938,7 @@ class PhotosDB:
        return folders

    def _album_folder_hierarchy_list(self, album_uuid):
+        """ return appropriate album_folder_hierarchy_list for the _db_version """
        if self._db_version <= _PHOTOS_4_VERSION:
            return self._album_folder_hierarchy_list_4(album_uuid)
        else:
@@ -1936,8 +1949,11 @@ class PhotosDB:
            the folder list is in form:
            ["Top level folder", "sub folder 1", "sub folder 2"]
            returns empty list of album is not in any folders """
-        # title = photosdb._dbalbum_details[album_uuid]["title"]
-        folders = self._dbalbum_folders[album_uuid]
+        try:
+            folders = self._dbalbum_folders[album_uuid]
+        except KeyError:
+            logging.debug(f"Caught _dbalbum_folders KeyError for album: {album_uuid}")
+            return []

        def _recurse_folder_hierarchy(folders, hierarchy=[]):
            """ recursively walk the folders dict to build list of folder hierarchy """
@@ -1970,8 +1986,11 @@ class PhotosDB:
            the folder list is in form:
            ["Top level folder", "sub folder 1", "sub folder 2"]
            returns empty list of album is not in any folders """
-        # title = photosdb._dbalbum_details[album_uuid]["title"]
-        folders = self._dbalbum_folders[album_uuid]
+        try:
+            folders = self._dbalbum_folders[album_uuid]
+        except KeyError:
+            logging.debug(f"Caught _dbalbum_folders KeyError for album: {album_uuid}")
+            return []

        def _recurse_folder_hierarchy(folders, hierarchy=[]):
            """ recursively walk the folders dict to build list of folder hierarchy """
--- a/osxphotos/placeinfo.py
+++ b/osxphotos/placeinfo.py
@@ -493,6 +493,14 @@ class PlaceInfo4(PlaceInfo):
        strval = "PlaceInfo(" + ", ".join([f"{k}='{v}'" for k, v in info.items()]) + ")"
        return strval

+    def as_dict(self):
+        info = {
+            "name": self.name,
+            "names": self.names._asdict(),
+            "country_code": self.country_code,
+        }
+        return info
+

 class PlaceInfo5(PlaceInfo):
    """ Reverse geolocation place info for a photo (Photos >= 5) """
@@ -624,3 +632,14 @@ class PlaceInfo5(PlaceInfo):
        }
        strval = "PlaceInfo(" + ", ".join([f"{k}='{v}'" for k, v in info.items()]) + ")"
        return strval
+
+    def as_dict(self):
+        info = {
+            "name": self.name,
+            "names": self.names._asdict(),
+            "country_code": self.country_code,
+            "ishome": self.ishome,
+            "address_str": self.address_str,
+            "address": self.address._asdict(),
+        }
+        return info
--- a/osxphotos/utils.py
+++ b/osxphotos/utils.py
@@ -18,7 +18,7 @@ import CoreServices
 import objc
 from Foundation import *

-from osxphotos._applescript import AppleScript
+from .fileutil import FileUtil

 _DEBUG = False

@@ -118,64 +118,6 @@ 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 
-        dest: destination path as string
-        norsrc: (bool) if True, uses --norsrc flag with ditto so it will not copy
-                resource fork or extended attributes.  May be useful on volumes that
-                don't work with extended attributes (likely only certain SMB mounts)
-                default is False
-        Uses ditto to perform copy; will silently overwrite dest if it exists
-        Raises exception if copy 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 norsrc:
-        command = ["/usr/bin/ditto", "--norsrc", src, dest]
-    else:
-        command = ["/usr/bin/ditto", src, dest]
-
-    # if error on copy, subprocess will raise CalledProcessError
-    try:
-        result = subprocess.run(command, check=True, stderr=subprocess.PIPE)
-    except subprocess.CalledProcessError as e:
-        logging.critical(
-            f"ditto returned error: {e.returncode} {e.stderr.decode(sys.getfilesystemencoding()).rstrip()}"
-        )
-        raise e
-
-    return result.returncode
-
-
 def dd_to_dms_str(lat, lon):
    """ convert latitude, longitude in degrees to degrees, minutes, seconds as string """
    """ lat: latitude in degrees  """
@@ -312,24 +254,6 @@ def list_photo_libraries():
    return lib_list


-def create_path_by_date(dest, dt):
-    """ Creates a path in dest folder in form dest/YYYY/MM/DD/
-        dest: valid path as str
-        dt: datetime.timetuple() object
-        Checks to see if path exists, if it does, do nothing and return path
-        If path does not exist, creates it and returns path"""
-    if not os.path.isdir(dest):
-        raise FileNotFoundError(f"dest {dest} must be valid path")
-    yyyy, mm, dd = dt[0:3]
-    yyyy = str(yyyy).zfill(4)
-    mm = str(mm).zfill(2)
-    dd = str(dd).zfill(2)
-    new_dest = os.path.join(dest, yyyy, mm, dd)
-    if not os.path.isdir(new_dest):
-        os.makedirs(new_dest)
-    return new_dest
-
-
 def get_preferred_uti_extension(uti):
    """ get preferred extension for a UTI type
        uti: UTI str, e.g. 'public.jpeg'
@@ -369,117 +293,6 @@ def findfiles(pattern, path_):
 #     open_scpt.run()


-def _export_photo_uuid_applescript(
-    uuid,
-    dest,
-    filestem=None,
-    original=True,
-    edited=False,
-    live_photo=False,
-    timeout=120,
-    burst=False,
-):
-    """ Export photo to dest path using applescript to control Photos
-        If photo is a live photo, exports both the photo and associated .mov file
-        uuid: UUID of photo to export
-        dest: destination path to export to
-        filestem: (string) if provided, exported filename will be named stem.ext 
-                  where ext is extension of the file exported by photos (e.g. .jpeg, .mov, etc)
-                  If not provided, file will be named with whatever name Photos uses
-                  If filestem.ext exists, it wil be overwritten
-        original: (boolean) if True, export original image; default = True
-        edited: (boolean) if True, export edited photo; default = False
-                If photo not edited and edited=True, will still export the original image
-                caller must verify image has been edited
-        *Note*: must be called with either edited or original but not both, 
-                will raise error if called with both edited and original = True
-        live_photo: (boolean) if True, export associated .mov live photo; default = False
-        timeout: timeout value in seconds; export will fail if applescript run time exceeds timeout
-        burst: (boolean) set to True if file is a burst image to avoid Photos export error
-        Returns: list of paths to exported file(s) or None if export failed
-        Note: For Live Photos, if edited=True, will export a jpeg but not the movie, even if photo
-              has not been edited. This is due to how Photos Applescript interface works.
-    """
-
-    # setup the applescript to do the export
-    export_scpt = AppleScript(
-        """ 
-		on export_by_uuid(theUUID, thePath, original, edited, theTimeOut)
-			tell application "Photos"
-				set thePath to thePath
-				set theItem to media item id theUUID
-				set theFilename to filename of theItem
-				set itemList to {theItem}
-				
-				if original then
-					with timeout of theTimeOut seconds
-						export itemList to POSIX file thePath with using originals
-					end timeout
-				end if
-				
-				if edited then
-					with timeout of theTimeOut seconds
-						export itemList to POSIX file thePath
-					end timeout
-				end if
-				
-				return theFilename
-			end tell
-
-		end export_by_uuid
-		"""
-    )
-
-    dest = pathlib.Path(dest)
-    if not dest.is_dir:
-        raise ValueError(f"dest {dest} must be a directory")
-
-    if not original ^ edited:
-        raise ValueError(f"edited or original must be True but not both")
-
-    tmpdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
-
-    # export original
-    filename = None
-    try:
-        filename = export_scpt.call(
-            "export_by_uuid", uuid, tmpdir.name, original, edited, timeout
-        )
-    except Exception as e:
-        logging.warning("Error exporting uuid %s: %s" % (uuid, str(e)))
-        return None
-
-    if filename is not None:
-        # need to find actual filename as sometimes Photos renames JPG to jpeg on export
-        # may be more than one file exported (e.g. if Live Photo, Photos exports both .jpeg and .mov)
-        # TemporaryDirectory will cleanup on return
-        filename_stem = pathlib.Path(filename).stem
-        files = glob.glob(os.path.join(tmpdir.name, "*"))
-        exported_paths = []
-        for fname in files:
-            path = pathlib.Path(fname)
-            if len(files) > 1 and not live_photo and path.suffix.lower() == ".mov":
-                # it's the .mov part of live photo but not requested, so don't export
-                logging.debug(f"Skipping live photo file {path}")
-                continue
-            if len(files) > 1 and burst and path.stem != filename_stem:
-                # skip any burst photo that's not the one we asked for
-                logging.debug(f"Skipping burst photo file {path}")
-                continue
-            if filestem:
-                # rename the file based on filestem, keeping original extension
-                dest_new = dest / f"{filestem}{path.suffix}"
-            else:
-                # use the name Photos provided
-                dest_new = dest / path.name
-            logging.debug(f"exporting {path} to dest_new: {dest_new}")
-            _copy_file(str(path), str(dest_new))
-            exported_paths.append(str(dest_new))
-        return exported_paths
-    else:
-        return None
-
-
 def _open_sql_file(dbname):
    """ opens sqlite file dbname in read-only mode
        returns tuple of (connection, cursor) """
@@ -516,3 +329,30 @@ def _db_is_locked(dbname):
        locked = True

    return locked
+
+
+# OSXPHOTOS_XATTR_UUID = "com.osxphotos.uuid"
+
+# def get_uuid_for_file(filepath):
+#     """ returns UUID associated with an exported file
+#         filepath: path to exported photo
+#     """
+#     attr = xattr.xattr(filepath)
+#     try:
+#         uuid_bytes = attr[OSXPHOTOS_XATTR_UUID]
+#         uuid_str = uuid_bytes.decode('utf-8')
+#     except KeyError:
+#         uuid_str = None
+#     return uuid_str
+
+# def set_uuid_for_file(filepath, uuid):
+#     """ sets the UUID associated with an exported file
+#         filepath: path to exported photo
+#         uuid: uuid string for photo
+#     """
+#     if not os.path.exists(filepath):
+#         raise FileNotFoundError(f"Missing file: {filepath}")
+
+#     attr = xattr.xattr(filepath)
+#     uuid_bytes = bytes(uuid, 'utf-8')
+#     attr.set(OSXPHOTOS_XATTR_UUID, uuid_bytes)
--- a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-10.15.4.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-10.15.4.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-Cloud-10.15.1.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-Cloud-10.15.1.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-Movie-5_0.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-Movie-5_0.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-Places-Catalina-10_15_1.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-Places-Catalina-10_15_1.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-RAW-10.15.1.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-RAW-10.15.1.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/Test-Shared-10.15.1.photoslibrary/database/search/psi.sqlite-shm
+++ b/tests/Test-Shared-10.15.1.photoslibrary/database/search/psi.sqlite-shm
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -0,0 +1,9 @@
+""" pytest test configuration """
+import pytest
+
+from osxphotos.exiftool import _ExifToolProc
+
+@pytest.fixture(autouse=True)
+def reset_singletons():
+    """ Need to clean up any ExifTool singletons between tests """
+    _ExifToolProc.instance = None
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -2,6 +2,8 @@ import os
 import pytest
 from click.testing import CliRunner

+from osxphotos.exiftool import get_exiftool_path
+
 CLI_PHOTOS_DB = "tests/Test-10.15.1.photoslibrary"
 LIVE_PHOTOS_DB = "tests/Test-Cloud-10.15.1.photoslibrary"
 RAW_PHOTOS_DB = "tests/Test-RAW-10.15.1.photoslibrary"
@@ -120,6 +122,11 @@ CLI_EXPORT_UUID = "D79B8D77-BFFC-460B-9312-034F2877D35B"

 CLI_EXPORT_UUID_FILENAME = "Pumkins2.jpg"

+CLI_EXPORT_BY_DATE = [
+    "2018/09/28/Pumpkins3.jpg",
+    "2018/09/28/Pumkins1.jpg",
+]
+
 CLI_EXPORT_SIDECAR_FILENAMES = ["Pumkins2.jpg", "Pumkins2.json", "Pumkins2.xmp"]

 CLI_EXPORT_LIVE = [
@@ -139,6 +146,24 @@ CLI_EXPORT_RAW_EDITED_ORIGINAL = ["IMG_0476_2.CR2", "IMG_0476_2_edited.jpeg"]

 CLI_PLACES_JSON = """{"places": {"_UNKNOWN_": 1, "Maui, Wailea, Hawai'i, United States": 1, "Washington, District of Columbia, United States": 1}}"""

+CLI_EXIFTOOL = {
+    "D79B8D77-BFFC-460B-9312-034F2877D35B": {
+        "File:FileName": "Pumkins2.jpg",
+        "IPTC:Keywords": "Kids",
+        "XMP:TagsList": "Kids",
+        "XMP:Title": "I found one!",
+        "EXIF:ImageDescription": "Girl holding pumpkin",
+        "XMP:Description": "Girl holding pumpkin",
+        "XMP:PersonInImage": "Katie",
+        "XMP:Subject": ["Kids", "Katie"],
+    }
+}
+# determine if exiftool installed so exiftool tests can be skipped
+try:
+    exiftool = get_exiftool_path()
+except:
+    exiftool = None
+

 def test_osxphotos():
    import osxphotos
@@ -243,7 +268,7 @@ def test_export():
        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)


-def test_export_using_hardlinks():
+def test_export_as_hardlink():
    import glob
    import os
    import os.path
@@ -263,7 +288,7 @@ def test_export_using_hardlinks():
        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)


-def test_export_using_hardlinks_samefile():
+def test_export_as_hardlink_samefile():
    # test that --export-as-hardlink actually creates a hardlink
    # src and dest should be same file
    import os
@@ -292,6 +317,34 @@ def test_export_using_hardlinks_samefile():
        assert os.path.samefile(CLI_EXPORT_UUID_FILENAME, photo.path)


+def test_export_using_hardlinks_incompat_options():
+    # test that error shown if --export-as-hardlink used with --exiftool
+    import os
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    photosdb = osxphotos.PhotosDB(dbfile=CLI_PHOTOS_DB)
+    photo = photosdb.photos(uuid=[CLI_EXPORT_UUID])[0]
+
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                ".",
+                f"--uuid={CLI_EXPORT_UUID}",
+                "--export-as-hardlink",
+                "--exiftool",
+                "-V",
+            ],
+        )
+        assert result.exit_code == 0
+        assert "Incompatible export options" in result.output
+
+
 def test_export_current_name():
    import glob
    import os
@@ -330,6 +383,40 @@ def test_export_skip_edited():
        assert "St James Park_edited.jpeg" not in files


+@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
+def test_export_exiftool():
+    import glob
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.__main__ import export
+    from osxphotos.exiftool import ExifTool
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        for uuid in CLI_EXIFTOOL:
+            result = runner.invoke(
+                export,
+                [
+                    os.path.join(cwd, PHOTOS_DB_15_4),
+                    ".",
+                    "-V",
+                    "--exiftool",
+                    "--uuid",
+                    f"{uuid}",
+                ],
+            )
+            assert result.exit_code == 0
+            files = glob.glob("*")
+            assert sorted(files) == sorted([CLI_EXIFTOOL[uuid]["File:FileName"]])
+
+            exif = ExifTool(CLI_EXIFTOOL[uuid]["File:FileName"]).as_dict()
+            for key in CLI_EXIFTOOL[uuid]:
+                assert exif[key] == CLI_EXIFTOOL[uuid][key]
+
+
 def test_query_date():
    import json
    import osxphotos
@@ -977,3 +1064,351 @@ def test_export_sidecar_keyword_template():
                assert sorted(json_got[k]) == sorted(v)
            else:
                assert json_got[k] == v
+
+
+def test_export_update_basic():
+    """ test export then update """
+    import glob
+    import os
+    import os.path
+
+    import osxphotos
+    from osxphotos.__main__ import export, OSXPHOTOS_EXPORT_DB
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V"])
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)
+        assert os.path.isfile(OSXPHOTOS_EXPORT_DB)
+
+        # update
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "--update"]
+        )
+        assert result.exit_code == 0
+        assert (
+            "Exported: 0 photos, updated: 0 photos, skipped: 8 photos, updated EXIF data: 0 photos"
+            in result.output
+        )
+
+
+@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
+def test_export_update_exiftool():
+    """ test export then update with exiftool """
+    import glob
+    import os
+    import os.path
+
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V"])
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)
+
+        # update with exiftool
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "--update", "--exiftool"]
+        )
+        assert result.exit_code == 0
+        assert (
+            "Exported: 0 photos, updated: 8 photos, skipped: 0 photos, updated EXIF data: 8 photos"
+            in result.output
+        )
+
+
+def test_export_update_hardlink():
+    """ test export with hardlink then update """
+    import glob
+    import os
+    import os.path
+
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    photosdb = osxphotos.PhotosDB(dbfile=CLI_PHOTOS_DB)
+    photo = photosdb.photos(uuid=[CLI_EXPORT_UUID])[0]
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--export-as-hardlink"],
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)
+        assert os.path.samefile(CLI_EXPORT_UUID_FILENAME, photo.path)
+
+        # update, should replace the hardlink files with new copies
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "--update"]
+        )
+        assert result.exit_code == 0
+        assert (
+            "Exported: 0 photos, updated: 8 photos, skipped: 0 photos, updated EXIF data: 0 photos"
+            in result.output
+        )
+        assert not os.path.samefile(CLI_EXPORT_UUID_FILENAME, photo.path)
+
+
+@pytest.mark.skipif(exiftool is None, reason="exiftool not installed")
+def test_export_update_hardlink_exiftool():
+    """ test export with hardlink then update with exiftool """
+    import glob
+    import os
+    import os.path
+
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    photosdb = osxphotos.PhotosDB(dbfile=CLI_PHOTOS_DB)
+    photo = photosdb.photos(uuid=[CLI_EXPORT_UUID])[0]
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--export-as-hardlink"],
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)
+        assert os.path.samefile(CLI_EXPORT_UUID_FILENAME, photo.path)
+
+        # update, should replace the hardlink files with new copies
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "--update", "--exiftool"]
+        )
+        assert result.exit_code == 0
+        assert (
+            "Exported: 0 photos, updated: 8 photos, skipped: 0 photos, updated EXIF data: 8 photos"
+            in result.output
+        )
+        assert not os.path.samefile(CLI_EXPORT_UUID_FILENAME, photo.path)
+
+
+def test_export_update_edits():
+    """ test export then update after removing and editing files """
+    import glob
+    import os
+    import os.path
+    import shutil
+
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--export-by-date"]
+        )
+        assert result.exit_code == 0
+
+        # change a couple of destination photos
+        os.unlink(CLI_EXPORT_BY_DATE[1])
+        shutil.copyfile(CLI_EXPORT_BY_DATE[0], CLI_EXPORT_BY_DATE[1])
+        os.unlink(CLI_EXPORT_BY_DATE[0])
+
+        # update
+        result = runner.invoke(
+            export,
+            [os.path.join(cwd, CLI_PHOTOS_DB), ".", "--update", "--export-by-date"],
+        )
+        assert result.exit_code == 0
+        assert (
+            "Exported: 1 photo, updated: 1 photo, skipped: 6 photos, updated EXIF data: 0 photos"
+            in result.output
+        )
+
+
+def test_export_update_no_db():
+    """ test export then update after db has been deleted """
+    import glob
+    import os
+    import os.path
+
+    import osxphotos
+    from osxphotos.__main__ import export, OSXPHOTOS_EXPORT_DB
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V"])
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)
+        assert os.path.isfile(OSXPHOTOS_EXPORT_DB)
+        os.unlink(OSXPHOTOS_EXPORT_DB)
+
+        # update
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "--update"]
+        )
+        assert result.exit_code == 0
+        assert (
+            "Exported: 0 photos, updated: 0 photos, skipped: 8 photos, updated EXIF data: 0 photos"
+            in result.output
+        )
+        assert os.path.isfile(OSXPHOTOS_EXPORT_DB)
+
+
+def test_export_then_hardlink():
+    """ test export then hardlink """
+    import glob
+    import os
+    import os.path
+
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    photosdb = osxphotos.PhotosDB(dbfile=CLI_PHOTOS_DB)
+    photo = photosdb.photos(uuid=[CLI_EXPORT_UUID])[0]
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V",],)
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES)
+        assert not os.path.samefile(CLI_EXPORT_UUID_FILENAME, photo.path)
+
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                ".",
+                "--export-as-hardlink",
+                "--overwrite",
+            ],
+        )
+        assert result.exit_code == 0
+        assert "Exported: 8 photos" in result.output
+        assert os.path.samefile(CLI_EXPORT_UUID_FILENAME, photo.path)
+
+
+def test_export_dry_run():
+    """ test export with dry-run flag """
+    import glob
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--dry-run"]
+        )
+        assert result.exit_code == 0
+        assert "Exported: 8 photos" in result.output
+        for filepath in CLI_EXPORT_FILENAMES:
+            assert f"Exported {filepath}" in result.output
+            assert not os.path.isfile(filepath)
+
+
+def test_export_update_edits_dry_run():
+    """ test export then update after removing and editing files with dry-run flag """
+    import glob
+    import os
+    import os.path
+    import shutil
+
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        # basic export
+        result = runner.invoke(
+            export, [os.path.join(cwd, CLI_PHOTOS_DB), ".", "-V", "--export-by-date"]
+        )
+        assert result.exit_code == 0
+
+        # change a couple of destination photos
+        os.unlink(CLI_EXPORT_BY_DATE[1])
+        shutil.copyfile(CLI_EXPORT_BY_DATE[0], CLI_EXPORT_BY_DATE[1])
+        os.unlink(CLI_EXPORT_BY_DATE[0])
+
+        # update dry-run
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                ".",
+                "--update",
+                "--export-by-date",
+                "--dry-run",
+            ],
+        )
+        assert result.exit_code == 0
+        assert (
+            "Exported: 1 photo, updated: 1 photo, skipped: 6 photos, updated EXIF data: 0 photos"
+            in result.output
+        )
+
+        # make sure file didn't really get copied
+        assert not os.path.isfile(CLI_EXPORT_BY_DATE[0])
+
+
+def test_export_directory_template_1_dry_run():
+    """ test export using directory template with dry-run flag """
+    import glob
+    import locale
+    import os
+    import os.path
+    import osxphotos
+    from osxphotos.__main__ import export
+
+    locale.setlocale(locale.LC_ALL, "en_US")
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            export,
+            [
+                os.path.join(cwd, CLI_PHOTOS_DB),
+                ".",
+                "-V",
+                "--directory",
+                "{created.year}/{created.month}",
+                "--dry-run",
+            ],
+        )
+        assert result.exit_code == 0
+        assert "Exported: 8 photos" in result.output
+        workdir = os.getcwd()
+        for filepath in CLI_EXPORTED_DIRECTORY_TEMPLATE_FILENAMES1:
+            assert f"Exported {filepath}" in result.output
+            assert not os.path.isfile(os.path.join(workdir, filepath))
--- a/tests/test_datetime_formatter.py
+++ b/tests/test_datetime_formatter.py
@@ -0,0 +1,21 @@
+""" test datetime_formatter.DateTimeFormatter """
+import pytest
+
+def test_datetime_formatter():
+    import datetime
+    import locale
+    from osxphotos.datetime_formatter import DateTimeFormatter
+    
+    locale.setlocale(locale.LC_ALL, "en_US")
+
+    dt = datetime.datetime(2020,5,23)
+    dtf = DateTimeFormatter(dt)
+
+    assert dtf.date == "2020-05-23"
+    assert dtf.year == "2020"
+    assert dtf.yy == "20"
+    assert dtf.month == "May"
+    assert dtf.mon == "May"
+    assert dtf.mm == "05"
+    assert dtf.dd == "23"
+    assert dtf.doy == "144"
--- a/tests/test_exiftool.py
+++ b/tests/test_exiftool.py
@@ -94,12 +94,12 @@ def test_setvalue_1():
    # test setting a tag value
    import os.path
    import tempfile
-    from osxphotos.utils import _copy_file
    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil

    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
-    _copy_file(TEST_FILE_ONE_KEYWORD, tempfile)
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)

    exif = osxphotos.exiftool.ExifTool(tempfile)
    exif.setvalue("IPTC:Keywords", "test")
@@ -111,12 +111,12 @@ def test_clear_value():
    # test clearing a tag value
    import os.path
    import tempfile
-    from osxphotos.utils import _copy_file
    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil

    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
-    _copy_file(TEST_FILE_ONE_KEYWORD, tempfile)
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)

    exif = osxphotos.exiftool.ExifTool(tempfile)
    assert "IPTC:Keywords" in exif.data
@@ -130,12 +130,12 @@ def test_addvalues_1():
    # test setting a tag value
    import os.path
    import tempfile
-    from osxphotos.utils import _copy_file
    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil

    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_ONE_KEYWORD))
-    _copy_file(TEST_FILE_ONE_KEYWORD, tempfile)
+    FileUtil.copy(TEST_FILE_ONE_KEYWORD, tempfile)

    exif = osxphotos.exiftool.ExifTool(tempfile)
    exif.addvalues("IPTC:Keywords", "test")
@@ -147,12 +147,12 @@ def test_addvalues_2():
    # test setting a tag value where multiple values already exist
    import os.path
    import tempfile
-    from osxphotos.utils import _copy_file
    import osxphotos.exiftool
+    from osxphotos.fileutil import FileUtil

    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
    tempfile = os.path.join(tempdir.name, os.path.basename(TEST_FILE_MULTI_KEYWORD))
-    _copy_file(TEST_FILE_MULTI_KEYWORD, tempfile)
+    FileUtil.copy(TEST_FILE_MULTI_KEYWORD, tempfile)

    exif = osxphotos.exiftool.ExifTool(tempfile)
    assert sorted(exif.data["IPTC:Keywords"]) == sorted(TEST_MULTI_KEYWORDS)
--- a/tests/test_export_db.py
+++ b/tests/test_export_db.py
@@ -0,0 +1,149 @@
+""" Test ExportDB """
+
+import pytest
+
+EXIF_DATA = """[{"_CreatedBy": "osxphotos, https://github.com/RhetTbull/osxphotos", "EXIF:ImageDescription": "\u2068Elder Park\u2069, \u2068Adelaide\u2069, \u2068Australia\u2069", "XMP:Description": "\u2068Elder Park\u2069, \u2068Adelaide\u2069, \u2068Australia\u2069", "XMP:Title": "Elder Park", "EXIF:GPSLatitude": "34 deg 55' 8.01\" S", "EXIF:GPSLongitude": "138 deg 35' 48.70\" E", "Composite:GPSPosition": "34 deg 55' 8.01\" S, 138 deg 35' 48.70\" E", "EXIF:GPSLatitudeRef": "South", "EXIF:GPSLongitudeRef": "East", "EXIF:DateTimeOriginal": "2017:06:20 17:18:56", "EXIF:OffsetTimeOriginal": "+09:30", "EXIF:ModifyDate": "2020:05:18 14:42:04"}]"""
+INFO_DATA = """{"uuid": "3DD2C897-F19E-4CA6-8C22-B027D5A71907", "filename": "3DD2C897-F19E-4CA6-8C22-B027D5A71907.jpeg", "original_filename": "IMG_4547.jpg", "date": "2017-06-20T17:18:56.518000+09:30", "description": "\u2068Elder Park\u2069, \u2068Adelaide\u2069, \u2068Australia\u2069", "title": "Elder Park", "keywords": [], "labels": ["Statue", "Art"], "albums": ["AlbumInFolder"], "folders": {"AlbumInFolder": ["Folder1", "SubFolder2"]}, "persons": [], "path": "/Users/rhet/Pictures/Test-10.15.4.photoslibrary/originals/3/3DD2C897-F19E-4CA6-8C22-B027D5A71907.jpeg", "ismissing": false, "hasadjustments": true, "external_edit": false, "favorite": false, "hidden": false, "latitude": -34.91889167000001, "longitude": 138.59686167, "path_edited": "/Users/rhet/Pictures/Test-10.15.4.photoslibrary/resources/renders/3/3DD2C897-F19E-4CA6-8C22-B027D5A71907_1_201_a.jpeg", "shared": false, "isphoto": true, "ismovie": false, "uti": "public.jpeg", "burst": false, "live_photo": false, "path_live_photo": null, "iscloudasset": false, "incloud": null, "date_modified": "2020-05-18T14:42:04.608664+09:30", "portrait": false, "screenshot": false, "slow_mo": false, "time_lapse": false, "hdr": false, "selfie": false, "panorama": false, "has_raw": false, "uti_raw": null, "path_raw": null, "place": {"name": "Elder Park, Adelaide, South Australia, Australia, River Torrens", "names": {"field0": [], "country": ["Australia"], "state_province": ["South Australia"], "sub_administrative_area": ["Adelaide"], "city": ["Adelaide", "Adelaide"], "field5": [], "additional_city_info": ["Adelaide CBD", "Tarndanya"], "ocean": [], "area_of_interest": ["Elder Park", ""], "inland_water": ["River Torrens", "River Torrens"], "field10": [], "region": [], "sub_throughfare": [], "field13": [], "postal_code": [], "field15": [], "field16": [], "street_address": [], "body_of_water": ["River Torrens", "River Torrens"]}, "country_code": "AU", "ishome": false, "address_str": "River Torrens, Adelaide SA, Australia", "address": {"street": null, "sub_locality": "Tarndanya", "city": "Adelaide", "sub_administrative_area": "Adelaide", "state_province": "SA", "postal_code": null, "country": "Australia", "iso_country_code": "AU"}}, "exif": {"flash_fired": false, "iso": 320, "metering_mode": 3, "sample_rate": null, "track_format": null, "white_balance": 0, "aperture": 2.2, "bit_rate": null, "duration": null, "exposure_bias": 0.0, "focal_length": 4.15, "fps": null, "latitude": null, "longitude": null, "shutter_speed": 0.058823529411764705, "camera_make": "Apple", "camera_model": "iPhone 6s", "codec": null, "lens_model": "iPhone 6s back camera 4.15mm f/2.2"}}"""
+EXIF_DATA2 = """[{"_CreatedBy": "osxphotos, https://github.com/RhetTbull/osxphotos", "XMP:Title": "St. James's Park", "XMP:TagsList": ["London 2018", "St. James's Park", "England", "United Kingdom", "UK", "London"], "IPTC:Keywords": ["London 2018", "St. James's Park", "England", "United Kingdom", "UK", "London"], "XMP:Subject": ["London 2018", "St. James's Park", "England", "United Kingdom", "UK", "London"], "EXIF:GPSLatitude": "51 deg 30' 12.86\" N", "EXIF:GPSLongitude": "0 deg 7' 54.50\" W", "Composite:GPSPosition": "51 deg 30' 12.86\" N, 0 deg 7' 54.50\" W", "EXIF:GPSLatitudeRef": "North", "EXIF:GPSLongitudeRef": "West", "EXIF:DateTimeOriginal": "2018:10:13 09:18:12", "EXIF:OffsetTimeOriginal": "-04:00", "EXIF:ModifyDate": "2019:12:08 14:06:44"}]"""
+INFO_DATA2 = """{"uuid": "F2BB3F98-90F0-4E4C-A09B-25C6822A4529", "filename": "F2BB3F98-90F0-4E4C-A09B-25C6822A4529.jpeg", "original_filename": "IMG_8440.JPG", "date": "2019-06-11T11:42:06.711805-07:00", "description": null, "title": null, "keywords": [], "labels": ["Sky", "Cloudy", "Fence", "Land", "Outdoor", "Park", "Amusement Park", "Roller Coaster"], "albums": [], "folders": {}, "persons": [], "path": "/Volumes/MacBook Catalina - Data/Users/rhet/Pictures/Photos Library.photoslibrary/originals/F/F2BB3F98-90F0-4E4C-A09B-25C6822A4529.jpeg", "ismissing": false, "hasadjustments": false, "external_edit": false, "favorite": false, "hidden": false, "latitude": 33.81558666666667, "longitude": -117.99298, "path_edited": null, "shared": false, "isphoto": true, "ismovie": false, "uti": "public.jpeg", "burst": false, "live_photo": false, "path_live_photo": null, "iscloudasset": true, "incloud": true, "date_modified": "2019-10-14T00:51:47.141950-07:00", "portrait": false, "screenshot": false, "slow_mo": false, "time_lapse": false, "hdr": false, "selfie": false, "panorama": false, "has_raw": false, "uti_raw": null, "path_raw": null, "place": {"name": "Adventure City, Stanton, California, United States", "names": {"field0": [], "country": ["United States"], "state_province": ["California"], "sub_administrative_area": ["Orange"], "city": ["Stanton", "Anaheim", "Anaheim"], "field5": [], "additional_city_info": ["West Anaheim"], "ocean": [], "area_of_interest": ["Adventure City", "Adventure City"], "inland_water": [], "field10": [], "region": [], "sub_throughfare": [], "field13": [], "postal_code": [], "field15": [], "field16": [], "street_address": [], "body_of_water": []}, "country_code": "US", "ishome": false, "address_str": "Adventure City, 1240 S Beach Blvd, Anaheim, CA  92804, United States", "address": {"street": "1240 S Beach Blvd", "sub_locality": "West Anaheim", "city": "Stanton", "sub_administrative_area": "Orange", "state_province": "CA", "postal_code": "92804", "country": "United States", "iso_country_code": "US"}}, "exif": {"flash_fired": false, "iso": 25, "metering_mode": 5, "sample_rate": null, "track_format": null, "white_balance": 0, "aperture": 2.2, "bit_rate": null, "duration": null, "exposure_bias": 0.0, "focal_length": 4.15, "fps": null, "latitude": null, "longitude": null, "shutter_speed": 0.0004940711462450593, "camera_make": "Apple", "camera_model": "iPhone 6s", "codec": null, "lens_model": "iPhone 6s back camera 4.15mm f/2.2"}}"""
+
+def test_export_db():
+    """ test ExportDB """
+    import os
+    import tempfile
+    from osxphotos._export_db import ExportDB
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    dbname = os.path.join(tempdir.name, ".osxphotos_export.db")
+    db = ExportDB(dbname)
+    assert os.path.isfile(dbname)
+
+    filepath = os.path.join(tempdir.name,"test.JPG")
+    filepath_lower = os.path.join(tempdir.name,"test.jpg")
+
+    db.set_uuid_for_file(filepath, "FOO-BAR")
+    # filename should be case-insensitive
+    assert db.get_uuid_for_file(filepath_lower) == "FOO-BAR"
+    db.set_info_for_uuid("FOO-BAR", INFO_DATA)
+    assert db.get_info_for_uuid("FOO-BAR") == INFO_DATA
+    db.set_exifdata_for_file(filepath, EXIF_DATA)
+    assert db.get_exifdata_for_file(filepath) == EXIF_DATA
+    db.set_stat_orig_for_file(filepath, (1, 2, 3))
+    assert db.get_stat_orig_for_file(filepath) == (1, 2, 3)
+    db.set_stat_exif_for_file(filepath, (4, 5, 6))
+    assert db.get_stat_exif_for_file(filepath) == (4, 5, 6)
+
+    # test set_data which sets all at the same time
+    filepath2 = os.path.join(tempdir.name,"test2.jpg")
+    db.set_data(filepath2, "BAR-FOO", (1, 2, 3), (4, 5, 6), INFO_DATA, EXIF_DATA)
+    assert db.get_uuid_for_file(filepath2) == "BAR-FOO"
+    assert db.get_info_for_uuid("BAR-FOO") == INFO_DATA
+    assert db.get_exifdata_for_file(filepath2) == EXIF_DATA
+    assert db.get_stat_orig_for_file(filepath2) == (1, 2, 3)
+    assert db.get_stat_exif_for_file(filepath2) == (4, 5, 6)
+
+    # close and re-open
+    db.close()
+    db = ExportDB(dbname)
+    assert db.get_uuid_for_file(filepath2) == "BAR-FOO"
+    assert db.get_info_for_uuid("BAR-FOO") == INFO_DATA
+    assert db.get_exifdata_for_file(filepath2) == EXIF_DATA
+    assert db.get_stat_orig_for_file(filepath2) == (1, 2, 3)
+    assert db.get_stat_exif_for_file(filepath2) == (4, 5, 6) 
+
+    # update data
+    db.set_uuid_for_file(filepath, "FUBAR")
+    assert db.get_uuid_for_file(filepath) == "FUBAR"
+
+def test_export_db_no_op():
+    """ test ExportDBNoOp """
+    import os
+    import tempfile
+    from osxphotos._export_db import ExportDBNoOp
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    db = ExportDBNoOp()
+
+    filepath = os.path.join(tempdir.name,"test.JPG")
+    filepath_lower = os.path.join(tempdir.name,"test.jpg")
+
+    db.set_uuid_for_file(filepath, "FOO-BAR")
+    # filename should be case-insensitive
+    assert db.get_uuid_for_file(filepath_lower) is None
+    db.set_info_for_uuid("FOO-BAR", INFO_DATA)
+    assert db.get_info_for_uuid("FOO-BAR") is None
+    db.set_exifdata_for_file(filepath, EXIF_DATA)
+    assert db.get_exifdata_for_file(filepath) is None
+    db.set_stat_orig_for_file(filepath, (1, 2, 3))
+    assert db.get_stat_orig_for_file(filepath) is None
+    db.set_stat_exif_for_file(filepath, (4, 5, 6))
+    assert db.get_stat_exif_for_file(filepath) is None
+
+    # test set_data which sets all at the same time
+    filepath2 = os.path.join(tempdir.name,"test2.jpg")
+    db.set_data(filepath2, "BAR-FOO", (1, 2, 3), (4, 5, 6), INFO_DATA, EXIF_DATA)
+    assert db.get_uuid_for_file(filepath2) is None
+    assert db.get_info_for_uuid("BAR-FOO") is None
+    assert db.get_exifdata_for_file(filepath2) is None
+    assert db.get_stat_orig_for_file(filepath2) is None
+    assert db.get_stat_exif_for_file(filepath2) is None
+
+    # update data
+    db.set_uuid_for_file(filepath, "FUBAR")
+    assert db.get_uuid_for_file(filepath) is None
+
+def test_export_db_in_memory():
+    """ test ExportDBInMemory """
+    import os
+    import tempfile
+    from osxphotos._export_db import ExportDB, ExportDBInMemory
+
+    tempdir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    dbname = os.path.join(tempdir.name, ".osxphotos_export.db")
+    db = ExportDB(dbname)
+    assert os.path.isfile(dbname)
+
+    filepath = os.path.join(tempdir.name,"test.JPG")
+    filepath_lower = os.path.join(tempdir.name,"test.jpg")
+
+    db.set_uuid_for_file(filepath, "FOO-BAR")
+    db.set_info_for_uuid("FOO-BAR", INFO_DATA)
+    db.set_exifdata_for_file(filepath, EXIF_DATA)
+    db.set_stat_orig_for_file(filepath, (1, 2, 3))
+    db.set_stat_exif_for_file(filepath, (4, 5, 6))
+
+    db.close()
+
+    dbram = ExportDBInMemory(dbname)
+
+    # verify values as expected
+    assert dbram.get_uuid_for_file(filepath_lower) == "FOO-BAR"
+    assert dbram.get_info_for_uuid("FOO-BAR") == INFO_DATA
+    assert dbram.get_exifdata_for_file(filepath) == EXIF_DATA
+    assert dbram.get_stat_orig_for_file(filepath) == (1, 2, 3)
+    assert dbram.get_stat_exif_for_file(filepath) == (4, 5, 6)
+
+    # change a value
+    dbram.set_uuid_for_file(filepath, "FUBAR")
+    dbram.set_info_for_uuid("FUBAR", INFO_DATA2)
+    dbram.set_exifdata_for_file(filepath, EXIF_DATA2)
+    dbram.set_stat_orig_for_file(filepath, (7,8,9))
+    dbram.set_stat_exif_for_file(filepath, (10,11,12)) 
+
+    assert dbram.get_uuid_for_file(filepath_lower) == "FUBAR"
+    assert dbram.get_info_for_uuid("FUBAR") == INFO_DATA2
+    assert dbram.get_exifdata_for_file(filepath) == EXIF_DATA2
+    assert dbram.get_stat_orig_for_file(filepath) == (7,8,9)
+    assert dbram.get_stat_exif_for_file(filepath) == (10,11,12)
+
+    dbram.close()
+
+    # re-open on disk and verify no changes
+    db = ExportDB(dbname)
+    assert db.get_uuid_for_file(filepath_lower) == "FOO-BAR"
+    assert db.get_info_for_uuid("FOO-BAR") == INFO_DATA
+    assert db.get_exifdata_for_file(filepath) == EXIF_DATA
+    assert db.get_stat_orig_for_file(filepath) == (1, 2, 3)
+    assert db.get_stat_exif_for_file(filepath) == (4, 5, 6)
+
+    assert db.get_info_for_uuid("FUBAR") is None
--- a/tests/test_fileutil.py
+++ b/tests/test_fileutil.py
@@ -0,0 +1,69 @@
+""" test FileUtil """
+
+import pytest
+
+
+def test_copy_file_valid():
+    # copy file with valid src, dest
+    import os.path
+    import tempfile
+    from osxphotos.fileutil import FileUtil
+
+    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    src = "tests/test-images/wedding.jpg"
+    result = FileUtil.copy(src, temp_dir.name)
+    assert result == 0
+    assert os.path.isfile(os.path.join(temp_dir.name, "wedding.jpg"))
+
+
+def test_copy_file_invalid():
+    # copy file with invalid src
+    import tempfile
+    from osxphotos.fileutil import FileUtil
+
+    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    src = "tests/test-images/wedding_DOES_NOT_EXIST.jpg"
+    with pytest.raises(Exception) as e:
+        assert FileUtil.copy(src, temp_dir.name)
+    assert e.type == FileNotFoundError
+
+
+def test_copy_file_norsrc():
+    # copy file with --norsrc
+    import os.path
+    import tempfile
+    from osxphotos.fileutil import FileUtil
+
+    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    src = "tests/test-images/wedding.jpg"
+    result = FileUtil.copy(src, temp_dir.name, norsrc=True)
+    assert result == 0
+    assert os.path.isfile(os.path.join(temp_dir.name, "wedding.jpg"))
+
+
+def test_hardlink_file_valid():
+    # hardlink file with valid src, dest
+    import os.path
+    import tempfile
+    from osxphotos.fileutil import FileUtil
+
+    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    src = "tests/test-images/wedding.jpg"
+    dest = os.path.join(temp_dir.name, "wedding.jpg")
+    FileUtil.hardlink(src, dest)
+    assert os.path.isfile(dest)
+    assert os.path.samefile(src, dest)
+
+
+def test_unlink_file():
+    import os.path
+    import tempfile
+    from osxphotos.fileutil import FileUtil
+
+    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
+    src = "tests/test-images/wedding.jpg"
+    dest = os.path.join(temp_dir.name, "wedding.jpg")
+    result = FileUtil.copy(src, temp_dir.name)
+    assert os.path.isfile(dest)
+    FileUtil.unlink(dest)
+    assert not os.path.isfile(dest)
--- a/tests/test_places_catalina_10_15_1.py
+++ b/tests/test_places_catalina_10_15_1.py
@@ -10,6 +10,44 @@ UUID_DICT = {
    "no_place": "A9B73E13-A6F2-4915-8D67-7213B39BAE9F",
 }

+MAUI_DICT = {
+    "name": "Maui, Wailea, Hawai'i, United States",
+    "names": {
+        "field0": [],
+        "country": ["United States"],
+        "state_province": ["Hawai'i"],
+        "sub_administrative_area": ["Maui"],
+        "city": ["Wailea", "Kihei", "Kihei"],
+        "field5": [],
+        "additional_city_info": [],
+        "ocean": [],
+        "area_of_interest": [],
+        "inland_water": [],
+        "field10": [],
+        "region": ["Maui"],
+        "sub_throughfare": [],
+        "field13": [],
+        "postal_code": [],
+        "field15": [],
+        "field16": [],
+        "street_address": ["3700 Wailea Alanui Dr"],
+        "body_of_water": [],
+    },
+    "country_code": "US",
+    "ishome": False,
+    "address_str": "3700 Wailea Alanui Dr, Kihei, HI  96753, United States",
+    "address": {
+        "street": "3700 Wailea Alanui Dr",
+        "sub_locality": None,
+        "city": "Kihei",
+        "sub_administrative_area": "Maui",
+        "state_province": "HI",
+        "postal_code": "96753",
+        "country": "United States",
+        "iso_country_code": "US",
+    },
+}
+

 def test_place_place_info_1():
    # test valid place info
@@ -92,6 +130,17 @@ def test_place_no_place_info():
    assert photo.place is None


+def test_place_place_info_as_dict():
+    # test PlaceInfo.as_dict()
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photo = photosdb.photos(uuid=[UUID_DICT["place_maui"]])[0]
+
+    assert isinstance(photo.place, osxphotos.placeinfo.PlaceInfo)
+    assert photo.place.as_dict() == MAUI_DICT
+
+
 # def test_place_str():
 #     # test __str__
 #     import osxphotos
--- a/tests/test_places_mojave_10_14_6.py
+++ b/tests/test_places_mojave_10_14_6.py
@@ -5,6 +5,32 @@ PHOTOS_DB = "./tests/Test-10.14.6.photoslibrary/database/photos.db"

 UUID_DICT = {"place_uk": "3Jn73XpSQQCluzRBMWRsMA", "no_place": "15uNd7%8RguTEgNPKHfTWw"}

+UK_DICT = {
+    "name": "St James's Park, Westminster, United Kingdom",
+    "names": {
+        "field0": [],
+        "country": ["United Kingdom"],
+        "state_province": ["England"],
+        "sub_administrative_area": ["London"],
+        "city": ["Westminster"],
+        "field5": [],
+        "additional_city_info": [],
+        "ocean": [],
+        "area_of_interest": ["St James's Park"],
+        "inland_water": [],
+        "field10": [],
+        "region": [],
+        "sub_throughfare": [],
+        "field13": [],
+        "postal_code": [],
+        "field15": [],
+        "field16": [],
+        "street_address": [],
+        "body_of_water": [],
+    },
+    "country_code": "GB",
+}
+

 def test_place_place_info_1():
    # test valid place info
@@ -60,3 +86,13 @@ def test_place_str():
        "region=[], sub_throughfare=[], field13=[], postal_code=[], field15=[], "
        "field16=[], street_address=[], body_of_water=[])', country_code='GB')"
    )
+
+def test_place_as_dict():
+    # test PlaceInfo.as_dict()
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photo = photosdb.photos(uuid=[UUID_DICT["place_uk"]])[0]
+    assert photo.place is not None
+    assert isinstance(photo.place, osxphotos.placeinfo.PlaceInfo)
+    assert photo.place.as_dict() == UK_DICT
--- a/tests/test_template.py
+++ b/tests/test_template.py
@@ -29,6 +29,8 @@ TEMPLATE_VALUES = {
    "{created.mm}": "02",
    "{created.month}": "February",
    "{created.mon}": "Feb",
+    "{created.dd}": "04",
+    "{created.dow}": "Tuesday",
    "{created.doy}": "035",
    "{modified.date}": "2020-03-21",
    "{modified.year}": "2020",
@@ -36,6 +38,7 @@ TEMPLATE_VALUES = {
    "{modified.mm}": "03",
    "{modified.month}": "March",
    "{modified.mon}": "Mar",
+    "{modified.dd}": "21",
    "{modified.doy}": "081",
    "{place.name}": "Washington, District of Columbia, United States",
    "{place.country_code}": "US",
@@ -64,13 +67,16 @@ TEMPLATE_VALUES_DEU = {
    "{created.mm}": "02",
    "{created.month}": "Februar",
    "{created.mon}": "Feb",
+    "{created.dd}": "04",
    "{created.doy}": "035",
+    "{created.dow}": "Dienstag",
    "{modified.date}": "2020-03-21",
    "{modified.year}": "2020",
    "{modified.yy}": "20",
    "{modified.mm}": "03",
    "{modified.month}": "März",
    "{modified.mon}": "Mär",
+    "{modified.dd}": "21",
    "{modified.doy}": "081",
    "{place.name}": "Washington, District of Columbia, United States",
    "{place.country_code}": "US",
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -55,44 +55,6 @@ def test_db_is_locked_unlocked():
    assert not osxphotos.utils._db_is_locked(DB_UNLOCKED_10_15)


-def test_copy_file_valid():
-    # _copy_file with valid src, dest
-    import os.path
-    import tempfile
-    from osxphotos.utils import _copy_file
-
-    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
-    src = "tests/test-images/wedding.jpg"
-    result = _copy_file(src, temp_dir.name)
-    assert result == 0
-    assert os.path.isfile(os.path.join(temp_dir.name, "wedding.jpg"))
-
-
-def test_copy_file_invalid():
-    # _copy_file with invalid src
-    import tempfile
-    from osxphotos.utils import _copy_file
-
-    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
-    src = "tests/test-images/wedding_DOES_NOT_EXIST.jpg"
-    with pytest.raises(Exception) as e:
-        assert _copy_file(src, temp_dir.name)
-    assert e.type == FileNotFoundError
-
-
-def test_copy_file_norsrc():
-    # _copy_file with --norsrc
-    import os.path
-    import tempfile
-    from osxphotos.utils import _copy_file
-
-    temp_dir = tempfile.TemporaryDirectory(prefix="osxphotos_")
-    src = "tests/test-images/wedding.jpg"
-    result = _copy_file(src, temp_dir.name, norsrc=True)
-    assert result == 0
-    assert os.path.isfile(os.path.join(temp_dir.name, "wedding.jpg"))
-
-
 def test_get_preferred_uti_extension():
    from osxphotos.utils import get_preferred_uti_extension

--- a/utils/build_help_table.py
+++ b/utils/build_help_table.py
@@ -1,6 +1,6 @@
 """ Builds the template table in markdown format for README.md """

-from osxphotos.template import (
+from osxphotos.photoinfo.template import (
    TEMPLATE_SUBSTITUTIONS,
    TEMPLATE_SUBSTITUTIONS_MULTI_VALUED,
 )
Author	SHA1	Message	Date
Rhet Turnbull	9eae66030e	Added --dry-run option to CLI export, closes #91	2020-05-25 10:37:30 -07:00
Rhet Turnbull	46fdc94398	Catch exception in folder processing to address #148	2020-05-24 07:22:00 -07:00
Rhet Turnbull	09c7d18901	Added test for DateTimeFormatter.dow	2020-05-24 06:37:15 -07:00
Rhet Turnbull	5f071b9c3f	Merge pull request #147 from grundsch/add_dow added created.dow (day of week) to template	2020-05-24 06:17:40 -07:00
Stephane	8df6d2c707	added created.dow (day of week) to template	2020-05-24 14:20:25 +02:00
Rhet Turnbull	28935b0af9	added created.dd and modified.dd to template system, closes #135	2020-05-23 21:39:40 -07:00
Rhet Turnbull	af750dd2e3	Updated CHANGELOG.md	2020-05-23 17:47:47 -07:00
Rhet Turnbull	1d095d7284	Added try/except for bad datettime values	2020-05-23 17:40:57 -07:00
Rhet Turnbull	f67f239278	Merge pull request #146 from agprimatic/patch-1 Catch illegal timestamp value	2020-05-23 16:06:23 -07:00
Ag Primatic	441de711dc	Catch illegal timestamp value When using this on my Photos database, it threw a ValueError. I wrapped the fromtimestamp() call in a try block so that it would continue with the oldest date allowable.	2020-05-23 18:15:45 -04:00
Rhet Turnbull	1450b3ccac	Updated CHANGELOG.md	2020-05-23 10:03:17 -07:00
Rhet Turnbull	c06c230a46	version bump	2020-05-23 09:37:10 -07:00
Rhet Turnbull	b1171e96cc	Added --update to CLI export; reference issue #100	2020-05-23 09:34:04 -07:00
Rhet Turnbull	8c4fe40aa6	Added as_dict to PlaceInfo	2020-05-23 08:47:10 -07:00
Rhet Turnbull	f416418546	Test library update	2020-05-16 06:53:03 -07:00
Rhet Turnbull	8e9691d6d7	Made --exiftool and --export-as-hardlink incompatible in CLI to fix #132	2020-05-16 06:48:23 -07:00
Rhet Turnbull	cafa483cfc	Updated CHANGELOG.md	2020-05-15 14:41:50 -07:00
Rhet Turnbull	11d368a69c	Updated README.md	2020-05-15 14:41:22 -07:00