AlbumInfo.photos now returns photos in album sort order

Refactored person processing to enable implementation of #181
Updated CHANGELOG.md
2020-07-06 10:06:11 -07:00 · 2020-07-06 00:10:22 -07:00 · 2020-07-04 10:17:25 -07:00 · 2020-07-04 09:54:43 -07:00 · 2020-07-03 12:31:18 -07:00 · 2020-07-03 12:28:26 -07:00
85 changed files with 1785 additions and 236 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,92 @@ 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.30.7](https://github.com/RhetTbull/osxphotos/compare/v0.30.6...v0.30.7)
+
+> 4 July 2020
+
+- Bug fix for keywords, persons in deleted photos [`df75a05`](https://github.com/RhetTbull/osxphotos/commit/df75a05645a88b31daa411f960d99ade71efc908)
+
+#### [v0.30.6](https://github.com/RhetTbull/osxphotos/compare/v0.30.5...v0.30.6)
+
+> 3 July 2020
+
+- Added height, width, orientation, filesize to json, str) [`8c3af0a`](https://github.com/RhetTbull/osxphotos/commit/8c3af0a4e4e49d9bbb33e809973d958334e44dca)
+
+#### [v0.30.5](https://github.com/RhetTbull/osxphotos/compare/v0.30.4...v0.30.5)
+
+> 3 July 2020
+
+- Added height, width, orientation, filesize, closes #163 [`#163`](https://github.com/RhetTbull/osxphotos/issues/163)
+
+#### [v0.30.4](https://github.com/RhetTbull/osxphotos/compare/v0.30.3...v0.30.4)
+
+> 3 July 2020
+
+- Added GPS location to XMP sidecar, closes #175 [`#175`](https://github.com/RhetTbull/osxphotos/issues/175)
+- Updated README.md [`7806e05`](https://github.com/RhetTbull/osxphotos/commit/7806e05673775ded231e65f53f3a1d5095a4b4e1)
+
+#### [v0.30.3](https://github.com/RhetTbull/osxphotos/compare/v0.30.2...v0.30.3)
+
+> 29 June 2020
+
+- Added --description-template to CLI, closes #166 [`#166`](https://github.com/RhetTbull/osxphotos/issues/166)
+- Added expand_inplace to PhotoTemplate.render [`ff03287`](https://github.com/RhetTbull/osxphotos/commit/ff0328785f3ea14b1c8ae2b7d1a9b07e8aef0777)
+- Updated README.md [`5950707`](https://github.com/RhetTbull/osxphotos/commit/59507077bafe39a17bc23babe6d6c52e1f502a53)
+
+#### [v0.30.2](https://github.com/RhetTbull/osxphotos/compare/v0.30.1...v0.30.2)
+
+> 28 June 2020
+
+- Added --deleted, --deleted-only to CLI, closes #179 [`#179`](https://github.com/RhetTbull/osxphotos/issues/179)
+
+#### [v0.30.1](https://github.com/RhetTbull/osxphotos/compare/v0.30.0...v0.30.1)
+
+> 27 June 2020
+
+- Changed default to PhotosDB.photos(movies=True), closes #177 [`#177`](https://github.com/RhetTbull/osxphotos/issues/177)
+
+#### [v0.30.0](https://github.com/RhetTbull/osxphotos/compare/v0.29.30...v0.30.0)
+
+> 27 June 2020
+
+- added intrash support for issue #179 [`185483e`](https://github.com/RhetTbull/osxphotos/commit/185483e1aa9ed107402bfb178f264417e6926b46)
+- Removed pdf filter on process_database_4 [`c1d1204`](https://github.com/RhetTbull/osxphotos/commit/c1d12047bde84740b96c8531110e7b2d2fe41f2e)
+
+#### [v0.29.30](https://github.com/RhetTbull/osxphotos/compare/v0.29.29...v0.29.30)
+
+> 24 June 2020
+
+- Added test for issue #178 [`46c87ee`](https://github.com/RhetTbull/osxphotos/commit/46c87eeed56d5765317dec4992d2e16323c711ad)
+- Additional fix for issue #178 [`fd4c990`](https://github.com/RhetTbull/osxphotos/commit/fd4c99032dbbedd6325aabacb0bc800b24ede413)
+
+#### [v0.29.29](https://github.com/RhetTbull/osxphotos/compare/v0.29.28...v0.29.29)
+
+> 23 June 2020
+
+- version bump [`d6fee89`](https://github.com/RhetTbull/osxphotos/commit/d6fee89fd9dd07c4788562ed551d0a3f2b5d697d)
+- Bug fix for issue #178 [`b8618cf`](https://github.com/RhetTbull/osxphotos/commit/b8618cf272efc174b7fa872f233b561bd9e7243e)
+
+#### [v0.29.28](https://github.com/RhetTbull/osxphotos/compare/v0.29.26...v0.29.28)
+
+> 22 June 2020
+
+- Closes #174 [`#174`](https://github.com/RhetTbull/osxphotos/issues/174)
+- Added today to template system, closes #167 [`#167`](https://github.com/RhetTbull/osxphotos/issues/167)
+- Minor refactoring in photoinfo.py [`a8e996e`](https://github.com/RhetTbull/osxphotos/commit/a8e996e66072e94de93fd4ea78a456bc61831f52)
+
+#### [v0.29.26](https://github.com/RhetTbull/osxphotos/compare/v0.29.25...v0.29.26)
+
+> 21 June 2020
+
+- Bug fix for issue #172 [`1ebf995`](https://github.com/RhetTbull/osxphotos/commit/1ebf99583397617f0d3a234c898beae1c14f5a63)
+
+#### [v0.29.25](https://github.com/RhetTbull/osxphotos/compare/v0.29.24...v0.29.25)
+
+> 21 June 2020
+
+- More PhotoInfo.albums refactoring, closes #169 [`#169`](https://github.com/RhetTbull/osxphotos/issues/169)
+
 #### [v0.29.24](https://github.com/RhetTbull/osxphotos/compare/v0.29.23...v0.29.24)

 > 21 June 2020
--- a/README.md
+++ b/README.md
@@ -207,6 +207,10 @@ Options:
                                  Search by end item date, e.g.
                                  2000-01-12T12:00:00 or 2000-12-31 (ISO 8601
                                  w/o TZ).
+  --deleted                       Include photos from the 'Recently Deleted'
+                                  folder.
+  --deleted-only                  Include only photos from the 'Recently
+                                  Deleted' folder.
  --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
@@ -249,6 +253,16 @@ Options:
                                  --keyword-template "{folder_album}"
                                  --keyword-template "{created.year}" See
                                  Templating System below.
+  --description-template TEMPLATE
+                                  For use with --exiftool, --sidecar; specify
+                                  a template string to use as description in
+                                  the form '{name,DEFAULT}' This is the same
+                                  format as --directory.  For example, if you
+                                  wanted to append 'exported with osxphotos on
+                                  [today's date]' to the description, you
+                                  could specify --description-template
+                                  "{descr} exported with osxphotos on
+                                  {today.date}" See Templating System below.
  --current-name                  Use photo's current filename instead of
                                  original filename for export.  Note:
                                  Starting with Photos 5, all photos are
@@ -428,6 +442,34 @@ Substitution                    Description
 {modified.hour}                 2-digit hour of the file modification time
 {modified.min}                  2-digit minute of the file modification time
 {modified.sec}                  2-digit second of the file modification time
+{today.date}                    Current date in iso format, e.g.
+                                '2020-03-22'
+{today.year}                    4-digit year of current date
+{today.yy}                      2-digit year of current date
+{today.mm}                      2-digit month of the current date (zero
+                                padded)
+{today.month}                   Month name in user's locale of the current
+                                date
+{today.mon}                     Month abbreviation in the user's locale of
+                                the current date
+{today.dd}                      2-digit day of the month (zero padded) of
+                                current date
+{today.dow}                     Day of week in user's locale of the current
+                                date
+{today.doy}                     3-digit day of year (e.g Julian day) of
+                                current date, starting from 1 (zero padded)
+{today.hour}                    2-digit hour of the current date
+{today.min}                     2-digit minute of the current date
+{today.sec}                     2-digit second of the current date
+{today.strftime}                Apply strftime template to current
+                                date/time. Should be used in form
+                                {today.strftime,TEMPLATE} where TEMPLATE is
+                                a valid strftime template, e.g.
+                                {today.strftime,%Y-%U} would result in year-
+                                week number of year: '2020-23'. If used with
+                                no template will return null value. See
+                                https://strftime.org/ for help on strftime
+                                templates.
 {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
@@ -492,6 +534,10 @@ Example: export photos to file structure based on 4-digit year and full name of

 `osxphotos export ~/Desktop/export --directory "{created.year}/{created.month}"`

+Example: export default library using 'country name/year' as output directory (but use "NoCountry/year" if country not specified), add persons, album names, and year as keywords, write exif metadata to files when exporting, update only changed files, print verbose ouput
+
+`osxphotos export ~/Desktop/export --directory "{place.name.country,NoCountry}/{created.year}"  --person-keyword --album-keyword --keyword-template "{created.year}" --exiftool --update --verbose`
+

 ## Example uses of the package 

@@ -847,7 +893,7 @@ for row in results:
 conn.close()
 ```

-#### ` photos(keywords=None, uuid=None, persons=None, albums=None, images=True, movies=False, from_date=None, to_date=None)`
+#### ` photos(keywords=None, uuid=None, persons=None, albums=None, images=True, movies=True, from_date=None, to_date=None, intrash=False)`

 ```python
 # assumes photosdb is a PhotosDB object (see above)
@@ -868,7 +914,8 @@ photos = photosdb.photos(
    images = bool,
    movies = bool,
    from_date = datetime.datetime,
-    to_date = datetime.datetime
+    to_date = datetime.datetime,
+    intrash = bool,
 )
 ```

@@ -877,9 +924,10 @@ photos = photosdb.photos(
 - ```persons```: list of one or more persons. Returns only photos containing the person(s).  If more than one person provided, returns photos that match any of the persons (e.g. treated as "or")
 - ```albums```: list of one or more album names.  Returns only photos contained in the album(s). If more than one album name is provided, returns photos contained in any of the albums (.e.g. treated as "or")
 - ```images```: bool; if True, returns photos/images; default is True
- ```movies```: bool; if True, returns movies/videos; default is False
+- ```movies```: bool; if True, returns movies/videos; default is True 
 - ```from_date```: datetime.datetime; if provided, finds photos where creation date >= from_date; default is None
 - ```to_date```: datetime.datetime; if provided, finds photos where creation date <= to_date; default is None
+- ```intrash```: if True, finds only photos in the "Recently Deleted" or trash folder, if False does not find any photos in the trash; default is False

 If more than one of (keywords, uuid, persons, albums,from_date, to_date) is provided, they are treated as "and" criteria. E.g.

@@ -922,15 +970,11 @@ photos2 = photosdb.photos(keywords=["Kids"])
 photos3 = [p for p in photos2 if p not in photos1]
 ```

-By default, photos() only returns images, not movies.  To also get movies, pass movies=True:
-```python
-photos_and_movies = photosdb.photos(movies=True)
-```
-
 To get only movies:
 ```python
 movies = photosdb.photos(images=False, movies=True)
 ```
+
 **Note** PhotosDB.photos() may return a different number of photos than Photos.app reports in the GUI. This is because photos() returns [hidden](#hidden) photos, [shared](#shared) photos, and for [burst](#burst) photos, all selected burst images even if non-selected burst images have not been deleted. Photos only reports 1 single photo for each set of burst images until you "finalize" the burst by selecting key photos and deleting the others using the "Make a selection" option. 

 For example, in my library, Photos says I have 19,386 photos and 474 movies.  However, PhotosDB.photos() reports 25,002 photos.  The difference is due to 5,609 shared photos and 7 hidden photos.  (*Note* Shared photos only valid for Photos 5).  Similarly, filtering for just movies returns 625 results.  The difference between 625 and 474 reported by Photos is due to 151 shared movies.
@@ -1004,6 +1048,27 @@ Returns the absolute path to the edited photo on disk as a string.  If the photo

 **Note**: will also return None if the edited photo is missing on disk. 

+#### `height`
+Returns height of the photo in pixels.  If image has been edited, returns height of the edited image, otherwise returns height of the original image.  See also [original_height](#original_height).
+
+#### `width`
+Returns width of the photo in pixels.  If image has been edited, returns width of the edited image, otherwise returns width of the original image.  See also [original_width](#original_width).
+
+#### `orientation`
+Returns EXIF orientation value of the photo as integer.  If image has been edited, returns orientation of the edited image, otherwise returns orientation of the original image. See also [original_orientation](#original_orientation).
+
+#### `original_height`
+Returns height of the original photo in pixels. See also [height](#height).
+
+#### `original_width`
+Returns width of the original photo in pixels. See also [width](#width). 
+
+#### `original_orientation`
+Returns EXIF orientation value of the original photo as integer. See also [orientation](#orientation).
+
+#### `original_filesize`
+Returns size of the original photo in bytes as integer.
+
 #### `ismissing`
 Returns `True` if the original image file is missing on disk, otherwise `False`.  This can occur if the file has been uploaded to iCloud but not yet downloaded to the local library or if the file was deleted or imported from a disk that has been unmounted and user hasn't enabled "Copy items to the Photos library" in Photos preferences. **Note**: this status is computed based on data in the Photos library and `ismissing` does not verify if the photo is actually missing. See also [path](#path).

@@ -1019,6 +1084,9 @@ Returns `True` if the picture has been marked as a favorite, otherwise `False`
 #### `hidden`
 Returns `True` if the picture has been marked as hidden, otherwise `False`

+#### `intrash`
+Returns `True` if the picture is in the trash ('Recently Deleted' folder), otherwise `False`
+
 #### `location`
 Returns latitude and longitude as a tuple of floats (latitude, longitude).  If location is not set, latitude and longitude are returned as `None`

@@ -1219,11 +1287,13 @@ If overwrite=False and increment=False, export will fail if destination file alr

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

-`render_template(template_str, none_str = "_", path_sep = None)`
+`render_template(template_str, none_str = "_", path_sep = None, expand_inplace = False, inplace_sep = None)`
 Render template string for photo.  none_str is used if template substitution results in None value and no default specified. 
 - `template_str`: str in form "{name,DEFAULT}" where name is one of the values in table below. The "," and default value that follows are optional. If specified, "DEFAULT" will be used if "name" is None.  This is useful for values which are not always present, for example reverse geolocation data.
 - `none_str`: optional str to use as substitution when template value is None and no default specified in the template string.  default is "_".
 - `path_sep`: optional character to use as path separator, default is os.path.sep
+- `expand_inplace`: expand multi-valued substitutions in-place as a single string instead of returning individual strings
+- `inplace_sep`: optional string to use as separator between multi-valued keywords with expand_inplace; default is ','

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

@@ -1284,7 +1354,7 @@ Returns the universally unique identifier (uuid) of the album.  This is how Phot
 Returns the title or name of the album.

 #### `photos`
-Returns a list of [PhotoInfo](#PhotoInfo) objects representing each photo contained in the album.
+Returns a list of [PhotoInfo](#PhotoInfo) objects representing each photo contained in the album sorted in the same order as in Photos. (e.g. if photos were manually sorted in the Photos albums, photos returned by `photos` will be in same order as they appear in the Photos album)

 #### `folder_list`
 Returns a hierarchical list of [FolderInfo](#FolderInfo) objects representing the folders the album is contained in.  For example, if album "AlbumInFolder" is in SubFolder2 of Folder1 as illustrated below, would return a list of `FolderInfo` objects representing ["Folder1", "SubFolder2"] 
@@ -1461,7 +1531,6 @@ Example: find your "best" photo of food
 ### Template Substitutions

 The following substitutions are availabe for use with `PhotoInfo.render_template()` 
-
 | Substitution | Description |
 |--------------|-------------|
 |{name}|Current filename of the photo|
@@ -1492,6 +1561,19 @@ The following substitutions are availabe for use with `PhotoInfo.render_template
 |{modified.hour}|2-digit hour of the file modification time|
 |{modified.min}|2-digit minute of the file modification time|
 |{modified.sec}|2-digit second of the file modification time|
+|{today.date}|Current date in iso format, e.g. '2020-03-22'|
+|{today.year}|4-digit year of current date|
+|{today.yy}|2-digit year of current date|
+|{today.mm}|2-digit month of the current date (zero padded)|
+|{today.month}|Month name in user's locale of the current date|
+|{today.mon}|Month abbreviation in the user's locale of the current date|
+|{today.dd}|2-digit day of the month (zero padded) of current date|
+|{today.dow}|Day of week in user's locale of the current date|
+|{today.doy}|3-digit day of year (e.g Julian day) of current date, starting from 1 (zero padded)|
+|{today.hour}|2-digit hour of the current date|
+|{today.min}|2-digit minute of the current date|
+|{today.sec}|2-digit second of the current date|
+|{today.strftime}|Apply strftime template to current date/time. Should be used in form {today.strftime,TEMPLATE} where TEMPLATE is a valid strftime template, e.g. {today.strftime,%Y-%U} would result in year-week number of year: '2020-23'. If used with no template will return null value. See https://strftime.org/ for help on strftime templates.|
 |{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|
 |{place.name.country}|Country name from the photo's reverse geolocation data|
--- a/osxphotos/init.py
+++ b/osxphotos/init.py
@@ -3,14 +3,9 @@ import logging
 from ._version import __version__
 from .photoinfo import PhotoInfo
 from .photosdb import PhotosDB
-from .utils import _set_debug, _debug, _get_logger
+from .phototemplate import PhotoTemplate
+from .utils import _debug, _get_logger, _set_debug

-# TODO: find edited photos: see https://github.com/orangeturtle739/photos-export/blob/master/extract_photos.py
 # TODO: Add test for imageTimeZoneOffsetSeconds = None
-# TODO: Fix command line so multiple --keyword, etc. are AND (instead of OR as they are in .photos())
-#       Or fix the help text to match behavior
 # TODO: Add test for __str__ and to_json
-# TODO: fix docstrings
 # TODO: Add special albums and magic albums
-# TODO: cleanup os.path and pathlib code (import pathlib and also from pathlib import Path)
-
--- a/osxphotos/main.py
+++ b/osxphotos/main.py
@@ -236,6 +236,25 @@ JSON_OPTION = click.option(
 )


+def deleted_options(f):
+    o = click.option
+    options = [
+        o(
+            "--deleted",
+            is_flag=True,
+            help="Include photos from the 'Recently Deleted' folder.",
+        ),
+        o(
+            "--deleted-only",
+            is_flag=True,
+            help="Include only photos from the 'Recently Deleted' folder.",
+        ),
+    ]
+    for o in options[::-1]:
+        f = o(f)
+    return f
+
+
 def query_options(f):
    o = click.option
    options = [
@@ -501,10 +520,14 @@ def debug_dump(ctx, cli_obj, db, photos_library, dump, uuid):
            print("_dbkeywords_uuid:")
            pprint.pprint(photosdb._dbkeywords_uuid)
        elif attr == "persons":
-            print("_dbfaces_person:")
-            pprint.pprint(photosdb._dbfaces_person)
            print("_dbfaces_uuid:")
            pprint.pprint(photosdb._dbfaces_uuid)
+            print("_dbfaces_pk:")
+            pprint.pprint(photosdb._dbfaces_pk)
+            print("_dbpersons_pk:")
+            pprint.pprint(photosdb._dbpersons_pk)
+            print("_dbpersons_fullname:")
+            pprint.pprint(photosdb._dbpersons_fullname)
        elif attr == "photos":
            if uuid:
                for uuid_ in uuid:
@@ -650,7 +673,7 @@ def info(ctx, cli_obj, db, json_, photos_library):

    photosdb = osxphotos.PhotosDB(dbfile=db)
    info = {"database_path": photosdb.db_path, "database_version": photosdb.db_version}
-    photos = photosdb.photos()
+    photos = photosdb.photos(movies=False)
    not_shared_photos = [p for p in photos if not p.shared]
    info["photo_count"] = len(not_shared_photos)

@@ -745,10 +768,11 @@ def places(ctx, cli_obj, db, json_, photos_library):
@cli.command()
@DB_OPTION
@JSON_OPTION
+@deleted_options
@DB_ARGUMENT
@click.pass_obj
@click.pass_context
-def dump(ctx, cli_obj, db, json_, photos_library):
+def dump(ctx, cli_obj, db, json_, deleted, deleted_only, photos_library):
    """ Print list of all photos & associated info from the Photos library. """

    db = get_photos_db(*photos_library, db, cli_obj.db)
@@ -758,8 +782,20 @@ def dump(ctx, cli_obj, db, json_, photos_library):
        _list_libraries()
        return

+    # check exclusive options
+    if deleted and deleted_only:
+        click.echo("Incompatible dump options", err=True)
+        click.echo(cli.commands["dump"].get_help(ctx), err=True)
+        return
+
    photosdb = osxphotos.PhotosDB(dbfile=db)
-    photos = photosdb.photos(movies=True)
+    if deleted or deleted_only:
+        photos = photosdb.photos(movies=True, intrash=True)
+    else:
+        photos = []
+    if not deleted_only:
+        photos += photosdb.photos(movies=True)
+
    print_photo_info(photos, json_ or cli_obj.json)


@@ -815,6 +851,7 @@ def _list_libraries(json_=False, error=True):
@DB_OPTION
@JSON_OPTION
@query_options
+@deleted_options
@click.option("--missing", is_flag=True, help="Search for photos missing from disk.")
@click.option(
    "--not-missing",
@@ -901,6 +938,8 @@ def query(
    place,
    no_place,
    label,
+    deleted,
+    deleted_only,
 ):
    """ Query the Photos database using 1 or more search options; 
        if more than one option is provided, they are treated as "AND" 
@@ -942,9 +981,12 @@ def query(
        (selfie, not_selfie),
        (panorama, not_panorama),
        (any(place), no_place),
+        (deleted, deleted_only),
    ]
    # 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]):
+    if any(all(bb) for bb in exclusive) or 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
@@ -1018,6 +1060,8 @@ def query(
        place=place,
        no_place=no_place,
        label=label,
+        deleted=deleted,
+        deleted_only=deleted_only,
    )

    # below needed for to make CliRunner work for testing
@@ -1029,6 +1073,7 @@ def query(
@DB_OPTION
@click.option("--verbose", "-V", "verbose_", is_flag=True, help="Print verbose output.")
@query_options
+@deleted_options
@click.option(
    "--update",
    is_flag=True,
@@ -1105,6 +1150,18 @@ def query(
    '--keyword-template "{created.year}" '
    "See Templating System below.",
 )
+@click.option(
+    "--description-template",
+    metavar="TEMPLATE",
+    multiple=False,
+    default=None,
+    help="For use with --exiftool, --sidecar; specify a template string to use as "
+    "description in the form '{name,DEFAULT}' "
+    "This is the same format as --directory.  For example, if you wanted to append "
+    "'exported with osxphotos on [today's date]' to the description, you could specify "
+    '--description-template "{descr} exported with osxphotos on {today.date}" '
+    "See Templating System below.",
+)
@click.option(
    "--current-name",
    is_flag=True,
@@ -1219,6 +1276,7 @@ def export(
    person_keyword,
    album_keyword,
    keyword_template,
+    description_template,
    current_name,
    sidecar,
    only_photos,
@@ -1252,6 +1310,8 @@ def export(
    no_place,
    no_extended_attributes,
    label,
+    deleted,
+    deleted_only,
 ):
    """ Export photos from the Photos database.
        Export path DEST is required.
@@ -1290,6 +1350,7 @@ def export(
        (export_by_date, directory),
        (export_as_hardlink, exiftool),
        (any(place), no_place),
+        (deleted, deleted_only),
    ]
    if any(all(bb) for bb in exclusive):
        click.echo("Incompatible export options", err=True)
@@ -1411,6 +1472,8 @@ def export(
        place=place,
        no_place=no_place,
        label=label,
+        deleted=deleted,
+        deleted_only=deleted_only,
    )

    results_exported = []
@@ -1459,6 +1522,7 @@ def export(
                    album_keyword=album_keyword,
                    person_keyword=person_keyword,
                    keyword_template=keyword_template,
+                    description_template=description_template,
                    export_db=export_db,
                    fileutil=fileutil,
                    dry_run=dry_run,
@@ -1495,6 +1559,7 @@ def export(
                        album_keyword=album_keyword,
                        person_keyword=person_keyword,
                        keyword_template=keyword_template,
+                        description_template=description_template,
                        export_db=export_db,
                        fileutil=fileutil,
                        dry_run=dry_run,
@@ -1597,6 +1662,7 @@ def print_photo_info(photos, json=False):
                "has_raw",
                "uti_raw",
                "path_raw",
+                "intrash",
            ]
        )
        for p in photos:
@@ -1641,6 +1707,7 @@ def print_photo_info(photos, json=False):
                    p.has_raw,
                    p.uti_raw,
                    p.path_raw,
+                    p.intrash,
                ]
            )
        for row in dump:
@@ -1700,6 +1767,8 @@ def _query(
    place=None,
    no_place=None,
    label=None,
+    deleted=False,
+    deleted_only=False,
 ):
    """ run a query against PhotosDB to extract the photos based on user supply criteria 
        used by query and export commands 
@@ -1707,9 +1776,25 @@ def _query(
        if either is modified, need to ensure all three functions are updated """

    photosdb = osxphotos.PhotosDB(dbfile=db)
-    photos = photosdb.photos(
-        uuid=uuid, images=isphoto, movies=ismovie, from_date=from_date, to_date=to_date
-    )
+    if deleted or deleted_only:
+        photos = photosdb.photos(
+            uuid=uuid,
+            images=isphoto,
+            movies=ismovie,
+            from_date=from_date,
+            to_date=to_date,
+            intrash=True,
+        )
+    else:
+        photos = []
+    if not deleted_only:
+        photos += photosdb.photos(
+            uuid=uuid,
+            images=isphoto,
+            movies=ismovie,
+            from_date=from_date,
+            to_date=to_date,
+        )

    if album:
        photos = get_photos_by_attribute(photos, "albums", album, ignore_case)
@@ -1946,6 +2031,7 @@ def export_photo(
    album_keyword=None,
    person_keyword=None,
    keyword_template=None,
+    description_template=None,
    export_db=None,
    fileutil=FileUtil,
    dry_run=None,
@@ -1973,6 +2059,7 @@ 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
+        description_template: string; optional template string that will be rendered for use as photo description
        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
@@ -2047,6 +2134,7 @@ def export_photo(
                use_albums_as_keywords=album_keyword,
                use_persons_as_keywords=person_keyword,
                keyword_template=keyword_template,
+                description_template=description_template,
                update=update,
                export_db=export_db,
                fileutil=fileutil,
@@ -2102,6 +2190,7 @@ def export_photo(
                        use_albums_as_keywords=album_keyword,
                        use_persons_as_keywords=person_keyword,
                        keyword_template=keyword_template,
+                        description_template=description_template,
                        update=update,
                        export_db=export_db,
                        fileutil=fileutil,
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,3 +1,3 @@
 """ version info """

-__version__ = "0.29.25"
+__version__ = "0.30.9"
--- a/osxphotos/albuminfo.py
+++ b/osxphotos/albuminfo.py
@@ -48,8 +48,13 @@ class AlbumInfo:
        try:
            return self._photos
        except AttributeError:
-            uuid = self._db._dbalbums_album[self._uuid]
+            uuid, sort_order = zip(*self._db._dbalbums_album[self.uuid])
            self._photos = self._db.photos(uuid=uuid)
+            # PhotosDB.photos does not preserve order when passing in list of uuids
+            # so need to build photo list one a time
+            # sort uuids by sort order
+            sorted_uuid = sorted(zip(sort_order, uuid))
+            self._photos = [self._db.photos(uuid=[uuid])[0] for _, uuid in sorted_uuid]
            return self._photos

    @property
--- a/osxphotos/photoinfo/_photoinfo_export.py
+++ b/osxphotos/photoinfo/_photoinfo_export.py
@@ -215,6 +215,7 @@ def export(
    use_albums_as_keywords=False,
    use_persons_as_keywords=False,
    keyword_template=None,
+    description_template=None,
 ):
    """ export photo 
        dest: must be valid destination path (or exception raised) 
@@ -250,6 +251,7 @@ def export(
        use_persons_as_keywords: (boolean, default = False); if True, will include person names in keywords
        when exporting metadata with exiftool or sidecar
        keyword_template: (list of strings); list of template strings that will be rendered as used as keywords
+        description_template: string; optional template string that will be rendered for use as photo description
        returns: list of photos exported
        """

@@ -273,6 +275,7 @@ def export(
        use_albums_as_keywords=use_albums_as_keywords,
        use_persons_as_keywords=use_persons_as_keywords,
        keyword_template=keyword_template,
+        description_template=description_template,
    )

    return results.exported
@@ -297,6 +300,7 @@ def export2(
    use_albums_as_keywords=False,
    use_persons_as_keywords=False,
    keyword_template=None,
+    description_template=None,
    update=False,
    export_db=None,
    fileutil=FileUtil,
@@ -336,6 +340,7 @@ def export2(
        use_persons_as_keywords: (boolean, default = False); if True, will include person names in keywords
        when exporting metadata with exiftool or sidecar
        keyword_template: (list of strings); list of template strings that will be rendered as used as keywords
+        description_template: string; optional template string that will be rendered for use as photo description
        update: (boolean, default=False); if True export will run in update mode, that is, it will
                not export the photo if the current version already exists in the destination
        export_db: (ExportDB_ABC); instance of a class that conforms to ExportDB_ABC with methods
@@ -670,6 +675,7 @@ def export2(
            use_albums_as_keywords=use_albums_as_keywords,
            use_persons_as_keywords=use_persons_as_keywords,
            keyword_template=keyword_template,
+            description_template=description_template,
        )
        if not dry_run:
            try:
@@ -685,6 +691,7 @@ def export2(
            use_albums_as_keywords=use_albums_as_keywords,
            use_persons_as_keywords=use_persons_as_keywords,
            keyword_template=keyword_template,
+            description_template=description_template,
        )
        if not dry_run:
            try:
@@ -712,6 +719,7 @@ def export2(
                        use_albums_as_keywords=use_albums_as_keywords,
                        use_persons_as_keywords=use_persons_as_keywords,
                        keyword_template=keyword_template,
+                        description_template=description_template,
                    )
                )[0]
                if old_data != current_data:
@@ -727,6 +735,7 @@ def export2(
                        use_albums_as_keywords=use_albums_as_keywords,
                        use_persons_as_keywords=use_persons_as_keywords,
                        keyword_template=keyword_template,
+                        description_template=description_template,
                    )
                export_db.set_exifdata_for_file(
                    exported_file,
@@ -734,6 +743,7 @@ def export2(
                        use_albums_as_keywords=use_albums_as_keywords,
                        use_persons_as_keywords=use_persons_as_keywords,
                        keyword_template=keyword_template,
+                        description_template=description_template,
                    ),
                )
                export_db.set_stat_exif_for_file(
@@ -749,6 +759,7 @@ def export2(
                    use_albums_as_keywords=use_albums_as_keywords,
                    use_persons_as_keywords=use_persons_as_keywords,
                    keyword_template=keyword_template,
+                    description_template=description_template,
                )
            export_db.set_exifdata_for_file(
                exported_file,
@@ -756,6 +767,7 @@ def export2(
                    use_albums_as_keywords=use_albums_as_keywords,
                    use_persons_as_keywords=use_persons_as_keywords,
                    keyword_template=keyword_template,
+                    description_template=description_template,
                ),
            )
            export_db.set_stat_exif_for_file(
@@ -955,6 +967,7 @@ def _write_exif_data(
    use_albums_as_keywords=False,
    use_persons_as_keywords=False,
    keyword_template=None,
+    description_template=None,
 ):
    """ write exif data to image file at filepath
    filepath: full path to the image file """
@@ -966,6 +979,7 @@ def _write_exif_data(
            use_albums_as_keywords=use_albums_as_keywords,
            use_persons_as_keywords=use_persons_as_keywords,
            keyword_template=keyword_template,
+            description_template=description_template,
        )
    )[0]
    for exiftag, val in exif_info.items():
@@ -984,6 +998,7 @@ def _exiftool_json_sidecar(
    use_albums_as_keywords=False,
    use_persons_as_keywords=False,
    keyword_template=None,
+    description_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
@@ -1009,7 +1024,13 @@ def _exiftool_json_sidecar(
    exif = {}
    exif["_CreatedBy"] = "osxphotos, https://github.com/RhetTbull/osxphotos"

-    if self.description:
+    if description_template is not None:
+        description = self.render_template(
+            description_template, expand_inplace=True, inplace_sep=", "
+        )[0]
+        exif["EXIF:ImageDescription"] = description
+        exif["XMP:Description"] = description
+    elif self.description:
        exif["EXIF:ImageDescription"] = self.description
        exif["XMP:Description"] = self.description

@@ -1082,7 +1103,6 @@ def _exiftool_json_sidecar(
        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
@@ -1112,16 +1132,25 @@ def _xmp_sidecar(
    use_albums_as_keywords=False,
    use_persons_as_keywords=False,
    keyword_template=None,
+    description_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 """
+        keyword_template: (list of strings); list of template strings to render as keywords 
+        description_template: string; optional template string that will be rendered for use as photo description """

    # TODO: add additional fields to XMP file?

    xmp_template = Template(filename=os.path.join(_TEMPLATE_DIR, _XMP_TEMPLATE_NAME))

+    if description_template is not None:
+        description = self.render_template(
+            description_template, expand_inplace=True, inplace_sep=", "
+        )[0]
+    else:
+        description = self.description if self.description is not None else ""
+
    keyword_list = []
    if self.keywords:
        keyword_list.extend(self.keywords)
@@ -1178,7 +1207,11 @@ def _xmp_sidecar(
        subject_list = list(self.keywords) + person_list

    xmp_str = xmp_template.render(
-        photo=self, keywords=keyword_list, persons=person_list, subjects=subject_list
+        photo=self,
+        description=description,
+        keywords=keyword_list,
+        persons=person_list,
+        subjects=subject_list,
    )

    # remove extra lines that mako inserts from template
--- a/osxphotos/photoinfo/photoinfo.py
+++ b/osxphotos/photoinfo/photoinfo.py
@@ -69,6 +69,7 @@ class PhotoInfo:
    @property
    def filename(self):
        """ filename of the picture """
+        # sourcery off
        if self.has_raw and self.raw_original:
            # return name of the RAW file
            # TODO: not yet implemented
@@ -89,8 +90,7 @@ class PhotoInfo:
        seconds = self._info["imageTimeZoneOffsetSeconds"] or 0
        delta = timedelta(seconds=seconds)
        tz = timezone(delta)
-        imagedate_utc = imagedate.astimezone(tz=tz)
-        return imagedate_utc
+        return imagedate.astimezone(tz=tz)

    @property
    def date_modified(self):
@@ -101,8 +101,7 @@ class PhotoInfo:
            seconds = self._info["imageTimeZoneOffsetSeconds"] or 0
            delta = timedelta(seconds=seconds)
            tz = timezone(delta)
-            imagedate_utc = imagedate.astimezone(tz=tz)
-            return imagedate_utc
+            return imagedate.astimezone(tz=tz)
        else:
            return None

@@ -340,7 +339,7 @@ class PhotoInfo:
    @property
    def persons(self):
        """ list of persons in picture """
-        return self._info["persons"]
+        return [self._db._dbpersons_pk[k]["fullname"] for k in self._info["persons"]]

    @property
    def albums(self):
@@ -418,6 +417,11 @@ class PhotoInfo:
        """ True if picture is hidden """
        return True if self._info["hidden"] == 1 else False

+    @property
+    def intrash(self):
+        """ True if picture is in trash ('Recently Deleted' folder)"""
+        return self._info["intrash"]
+
    @property
    def location(self):
        """ returns (latitude, longitude) as float in degrees or None """
@@ -494,12 +498,11 @@ class PhotoInfo:
            self is not included in the returned list """
        if self._info["burst"]:
            burst_uuid = self._info["burstUUID"]
-            burst_photos = [
+            return [
                PhotoInfo(db=self._db, uuid=u, info=self._db._dbphotos[u])
                for u in self._db._dbphotos_burst[burst_uuid]
                if u != self._uuid
            ]
-            return burst_photos
        else:
            return []

@@ -639,7 +642,49 @@ class PhotoInfo:
            otherwise returns False """
        return self._info["raw_is_original"]

-    def render_template(self, template_str, none_str="_", path_sep=None):
+    @property
+    def height(self):
+        """ returns height of the current photo version in pixels """
+        return self._info["height"]
+
+    @property
+    def width(self):
+        """ returns width of the current photo version in pixels """
+        return self._info["width"]
+
+    @property
+    def orientation(self):
+        """ returns EXIF orientation of the current photo version as int """
+        return self._info["orientation"]
+
+    @property
+    def original_height(self):
+        """ returns height of the original photo version in pixels """
+        return self._info["original_height"]
+
+    @property
+    def original_width(self):
+        """ returns width of the original photo version in pixels """
+        return self._info["original_width"]
+
+    @property
+    def original_orientation(self):
+        """ returns EXIF orientation of the original photo version as int """
+        return self._info["original_orientation"]
+
+    @property
+    def original_filesize(self):
+        """ returns filesize of original photo in bytes as int """
+        return self._info["original_filesize"]
+
+    def render_template(
+        self,
+        template_str,
+        none_str="_",
+        path_sep=None,
+        expand_inplace=False,
+        inplace_sep=None,
+    ):
        """Renders a template string for PhotoInfo instance using PhotoTemplate

        Args:
@@ -647,12 +692,22 @@ class PhotoInfo:
            none_str: a str to use if template field renders to None, default is "_".
            path_sep: a single character str to use as path separator when joining 
                fields like folder_album; if not provided, defaults to os.path.sep
+            expand_inplace: expand multi-valued substitutions in-place as a single string 
+                instead of returning individual strings
+            inplace_sep: optional string to use as separator between multi-valued keywords
+                with expand_inplace; default is ','
        
        Returns:
            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
        """
        template = PhotoTemplate(self)
-        return template.render(template_str, none_str, path_sep)
+        return template.render(
+            template_str,
+            none_str=none_str,
+            path_sep=path_sep,
+            expand_inplace=expand_inplace,
+            inplace_sep=inplace_sep,
+        )

    @property
    def _longitude(self):
@@ -750,6 +805,14 @@ class PhotoInfo:
            "place": self.place,
            "exif": exif,
            "score": score,
+            "intrash": self.intrash,
+            "height": self.height,
+            "width": self.width,
+            "orientation": self.orientation,
+            "original_height": self.original_height,
+            "original_width": self.original_width,
+            "original_orientation": self.original_orientation,
+            "original_filesize": self.original_filesize,
        }
        return yaml.dump(info, sort_keys=False)

@@ -809,6 +872,14 @@ class PhotoInfo:
            "place": place,
            "exif": exif,
            "score": score,
+            "intrash": self.intrash,
+            "height": self.height,
+            "width": self.width,
+            "orientation": self.orientation,
+            "original_height": self.original_height,
+            "original_width": self.original_width,
+            "original_orientation": self.original_orientation,
+            "original_filesize": self.original_filesize,
        }
        return json.dumps(pic)

--- a/osxphotos/photosdb/photosdb.py
+++ b/osxphotos/photosdb/photosdb.py
@@ -122,17 +122,28 @@ class PhotosDB:
        # currently used to get information on RAW images
        self._dbphotos_master = {}

+        # Dict with information about all persons by person PK
+        # key is person PK, value is dict with info about each person
+        # e.g. {3: {"pk": 3, "fullname": "Maria Smith"...}}
+        self._dbpersons_pk = {}
+
+        # Dict with information about all persons by person fullname
+        # key is person PK, value is list of person PKs with fullname
+        # there may be more than one person PK with the same fullname
+        # e.g. {"Maria Smith": [1, 2]}
+        self._dbpersons_fullname = {}
+
        # Dict with information about all persons/photos by uuid
-        # key is photo UUID, value is list of face names in that photo
+        # key is photo UUID, value is list of person primary keys of persons in the photo
        # Note: Photos 5 identifies faces even if not given a name
        # and those are labeled by process_database as _UNKNOWN_
-        # e.g. {'1EB2B765-0765-43BA-A90C-0D0580E6172C': ['Katie', '_UNKNOWN_', 'Suzy']}
+        # e.g. {'1EB2B765-0765-43BA-A90C-0D0580E6172C': [1, 3, 5]}
        self._dbfaces_uuid = {}

-        # Dict with information about all persons/photos by person
-        # key is person name, value is list of photo UUIDs
-        # e.g. {'Maria': ['E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51']}
-        self._dbfaces_person = {}
+        # Dict with information about detected faces by person primary key
+        # key is person pk, value is list of photo UUIDs
+        # e.g. {3: ['E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51']}
+        self._dbfaces_pk = {}

        # Dict with information about all keywords/photos by uuid
        # key is photo uuid and value is list of keywords
@@ -156,8 +167,8 @@ class PhotosDB:
        self._dbalbums_pk = {}

        # Dict with information about all albums/photos by album
-        # key is album UUID, value is list of photo UUIDs contained in that album
-        # e.g. {'0C514A98-7B77-4E4F-801B-364B7B65EAFA': ['1EB2B765-0765-43BA-A90C-0D0580E6172C']}
+        # key is album UUID, value is list of tuples of (photo UUID, sort order) contained in that album
+        # e.g. {'0C514A98-7B77-4E4F-801B-364B7B65EAFA': [('1EB2B765-0765-43BA-A90C-0D0580E6172C', 1024)]}
        self._dbalbums_album = {}

        # Dict with information about album details
@@ -303,7 +314,13 @@ class PhotosDB:
    @property
    def persons_as_dict(self):
        """ return persons as dict of person, count in reverse sorted order (descending) """
-        persons = {k: len(self._dbfaces_person[k]) for k in self._dbfaces_person.keys()}
+        persons = {}
+        for pk in self._dbfaces_pk:
+            fullname = self._dbpersons_pk[pk]["fullname"]
+            try:
+                persons[fullname] += len(self._dbfaces_pk[pk])
+            except KeyError:
+                persons[fullname] = len(self._dbfaces_pk[pk])
        persons = dict(sorted(persons.items(), key=lambda kv: kv[1], reverse=True))
        return persons

@@ -352,7 +369,7 @@ class PhotosDB:
    @property
    def persons(self):
        """ return list of persons found in photos database """
-        persons = self._dbfaces_person.keys()
+        persons = {self._dbpersons_pk[k]["fullname"] for k in self._dbfaces_pk}
        return list(persons)

    @property
@@ -536,41 +553,108 @@ class PhotosDB:

        (conn, c) = _open_sql_file(self._tmp_db)

-        # Look for all combinations of persons and pictures
+        # get info to associate persons with photos
+        # then get detected faces in each photo and link to persons
        c.execute(
-            """ select RKPerson.name, RKVersion.uuid from RKFace, RKPerson, RKVersion, RKMaster 
-                where RKFace.personID = RKperson.modelID and RKVersion.modelId = RKFace.ImageModelId 
-                and RKVersion.masterUuid = RKMaster.uuid  
-                and RKVersion.isInTrash = 0 """
+            """ SELECT
+                RKPerson.modelID,
+                RKPerson.uuid,
+                RKPerson.name,
+                RKPerson.faceCount,
+                RKPerson.displayName
+                FROM RKPerson
+            """
        )
+
+        # 0     RKPerson.modelID,
+        # 1     RKPerson.uuid,
+        # 2     RKPerson.name,
+        # 3     RKPerson.faceCount,
+        # 4     RKPerson.displayName
+
        for person in c:
-            if person[0] is None:
-                continue
-            if not person[1] in self._dbfaces_uuid:
-                self._dbfaces_uuid[person[1]] = []
-            if not person[0] in self._dbfaces_person:
-                self._dbfaces_person[person[0]] = []
-            self._dbfaces_uuid[person[1]].append(person[0])
-            self._dbfaces_person[person[0]].append(person[1])
+            pk = person[0]
+            fullname = person[2] if person[2] is not None else _UNKNOWN_PERSON
+            self._dbpersons_pk[pk] = {
+                "pk": pk,
+                "uuid": person[1],
+                "fullname": fullname,
+                "facecount": person[3],
+                "keyface": None,
+                "displayname": person[4],
+            }
+            try:
+                self._dbpersons_fullname[fullname].append(pk)
+            except KeyError:
+                self._dbpersons_fullname[fullname] = [pk]
+
+        # get information on detected faces
+        c.execute(
+            """ SELECT 
+                RKPerson.modelID,
+                RKVersion.uuid 
+                FROM 
+                RKFace, RKPerson, RKVersion, RKMaster 
+                WHERE 
+                RKFace.personID = RKperson.modelID AND 
+                RKVersion.modelId = RKFace.ImageModelId AND
+                RKVersion.masterUuid = RKMaster.uuid  
+            """
+        )
+
+        # 0     RKPerson.modelID
+        # 1     RKVersion.uuid
+
+        for face in c:
+            pk = face[0]
+            uuid = face[1]
+            try:
+                self._dbfaces_uuid[uuid].append(pk)
+            except KeyError:
+                self._dbfaces_uuid[uuid] = [pk]
+
+            try:
+                self._dbfaces_pk[pk].append(uuid)
+            except KeyError:
+                self._dbfaces_pk[pk] = [uuid]
+
+        if _debug():
+            logging.debug(f"Finished walking through persons")
+            logging.debug(pformat(self._dbpersons_pk))
+            logging.debug(pformat(self._dbpersons_fullname))
+            logging.debug(pformat(self._dbfaces_pk))
+            logging.debug(pformat(self._dbfaces_uuid))

        # Get info on albums
        c.execute(
-            """ select 
+            """ SELECT 
                RKAlbum.uuid, 
-                RKVersion.uuid 
-                from RKAlbum, RKVersion, RKAlbumVersion 
-                where RKAlbum.modelID = RKAlbumVersion.albumId and 
-                RKAlbumVersion.versionID = RKVersion.modelId  
-                and RKVersion.isInTrash = 0 """
+                RKVersion.uuid,
+                RKCustomSortOrder.orderNumber
+                FROM RKVersion
+				JOIN RKCustomSortOrder on RKCustomSortOrder.objectUuid = RKVersion.uuid
+				JOIN RKAlbum on RKAlbum.uuid = RKCustomSortOrder.containerUuid
+            """
        )
+
+        # 0     RKAlbum.uuid,
+        # 1     RKVersion.uuid,
+        # 2     RKCustomSortOrder.orderNumber
+
        for album in c:
            # store by uuid in _dbalbums_uuid and by album in _dbalbums_album
-            if not album[1] in self._dbalbums_uuid:
-                self._dbalbums_uuid[album[1]] = []
-            if not album[0] in self._dbalbums_album:
-                self._dbalbums_album[album[0]] = []
-            self._dbalbums_uuid[album[1]].append(album[0])
-            self._dbalbums_album[album[0]].append(album[1])
+            album_uuid = album[0]
+            photo_uuid = album[1]
+            sort_order = album[2]
+            try:
+                self._dbalbums_uuid[photo_uuid].append(album_uuid)
+            except KeyError:
+                self._dbalbums_uuid[photo_uuid] = [album_uuid]
+
+            try:
+                self._dbalbums_album[album_uuid].append((photo_uuid, sort_order))
+            except KeyError:
+                self._dbalbums_album[album_uuid] = [(photo_uuid, sort_order)]

        # now get additional details about albums
        c.execute(
@@ -680,12 +764,17 @@ class PhotosDB:

        # Get info on keywords
        c.execute(
-            """ select RKKeyword.name, RKVersion.uuid, RKMaster.uuid from 
+            """ SELECT
+                RKKeyword.name, 
+                RKVersion.uuid, 
+                RKMaster.uuid 
+                FROM 
                RKKeyword, RKKeywordForVersion, RKVersion, RKMaster 
-                where RKKeyword.modelId = RKKeyWordForVersion.keywordID and 
-                RKVersion.modelID = RKKeywordForVersion.versionID and 
-                RKMaster.uuid = RKVersion.masterUuid and 
-                RKVersion.isInTrash = 0 """
+                WHERE 
+                RKKeyword.modelId = RKKeyWordForVersion.keywordID AND 
+                RKVersion.modelID = RKKeywordForVersion.versionID AND 
+                RKMaster.uuid = RKVersion.masterUuid
+            """
        )
        for keyword in c:
            if not keyword[1] in self._dbkeywords_uuid:
@@ -715,9 +804,17 @@ class PhotosDB:
                    RKVersion.specialType, RKMaster.modelID, null, RKVersion.momentUuid,
                    RKVersion.rawMasterUuid,
                    RKVersion.nonRawMasterUuid,
-                    RKMaster.alternateMasterUuid
-                    FROM RKVersion, RKMaster WHERE RKVersion.isInTrash = 0 AND 
-                    RKVersion.masterUuid = RKMaster.uuid AND RKVersion.filename NOT LIKE '%.pdf' """
+                    RKMaster.alternateMasterUuid,
+                    RKVersion.isInTrash,
+                    RKVersion.processedHeight, 
+                    RKVersion.processedWidth, 
+                    RKVersion.orientation,
+                    RKMaster.height,
+                    RKMaster.width, 
+                    RKMaster.orientation,
+                    RKMaster.fileSize
+                    FROM RKVersion, RKMaster
+                    WHERE RKVersion.masterUuid = RKMaster.uuid"""
            )
        else:
            c.execute(
@@ -734,9 +831,17 @@ class PhotosDB:
                    RKVersion.momentUuid,
                    RKVersion.rawMasterUuid,
                    RKVersion.nonRawMasterUuid,
-                    RKMaster.alternateMasterUuid
-                    FROM RKVersion, RKMaster WHERE RKVersion.isInTrash = 0 AND 
-                    RKVersion.masterUuid = RKMaster.uuid AND RKVersion.filename NOT LIKE '%.pdf' """
+                    RKMaster.alternateMasterUuid,
+                    RKVersion.isInTrash,
+                    RKVersion.processedHeight, 
+                    RKVersion.processedWidth, 
+                    RKVersion.orientation,
+                    RKMaster.height,
+                    RKMaster.width, 
+                    RKMaster.orientation,
+                    RKMaster.originalFileSize
+                    FROM RKVersion, RKMaster 
+                    WHERE RKVersion.masterUuid = RKMaster.uuid"""
            )

        # order of results
@@ -772,6 +877,14 @@ class PhotosDB:
        # 29    RKVersion.rawMasterUuid, -- UUID of RAW master
        # 30    RKVersion.nonRawMasterUuid, -- UUID of non-RAW master
        # 31    RKMaster.alternateMasterUuid -- UUID of alternate master (will be RAW master for JPEG and JPEG master for RAW)
+        # 32    RKVersion.isInTrash
+        # 33    RKVersion.processedHeight,
+        # 34    RKVersion.processedWidth,
+        # 35    RKVersion.orientation,
+        # 36    RKMaster.height,
+        # 37    RKMaster.width,
+        # 38    RKMaster.orientation,
+        # 39    RKMaster.originalFileSize

        for row in c:
            uuid = row[0]
@@ -798,7 +911,7 @@ class PhotosDB:
            try:
                self._dbphotos[uuid]["imageDate"] = datetime.fromtimestamp(row[5] + td)
            except ValueError:
-                self._dbphotos[uuid]["imageDate"] = datetime.date(1970, 1, 1)
+                self._dbphotos[uuid]["imageDate"] = datetime(1970, 1, 1)

            self._dbphotos[uuid]["mainRating"] = row[6]
            self._dbphotos[uuid]["hasAdjustments"] = row[7]
@@ -914,6 +1027,18 @@ class PhotosDB:
            self._dbphotos[uuid]["non_raw_master_uuid"] = row[30]
            self._dbphotos[uuid]["alt_master_uuid"] = row[31]

+            # recently deleted items
+            self._dbphotos[uuid]["intrash"] = True if row[32] == 1 else False
+
+            # height/width/orientation
+            self._dbphotos[uuid]["height"] = row[33]
+            self._dbphotos[uuid]["width"] = row[34]
+            self._dbphotos[uuid]["orientation"] = row[35]
+            self._dbphotos[uuid]["original_height"] = row[36]
+            self._dbphotos[uuid]["original_width"] = row[37]
+            self._dbphotos[uuid]["original_orientation"] = row[38]
+            self._dbphotos[uuid]["original_filesize"] = row[39]
+
        # get additional details from RKMaster, needed for RAW processing
        c.execute(
            """ SELECT 
@@ -964,8 +1089,7 @@ class PhotosDB:
                RKModelResource.resourceTag, RKModelResource.UTI, RKVersion.specialType,
                RKModelResource.attachedModelType, RKModelResource.resourceType
                FROM RKVersion
-                JOIN RKModelResource on RKModelResource.attachedModelId = RKVersion.modelId
-                WHERE RKVersion.isInTrash = 0 """
+                JOIN RKModelResource on RKModelResource.attachedModelId = RKVersion.modelId """
        )

        # Order of results:
@@ -1008,8 +1132,7 @@ class PhotosDB:
                RKAdjustmentData.originator, 
                RKAdjustmentData.format 
                FROM RKVersion, RKAdjustmentData 
-                WHERE RKVersion.adjustmentUuid = RKAdjustmentData.uuid 
-                AND RKVersion.isInTrash = 0 """
+                WHERE RKVersion.adjustmentUuid = RKAdjustmentData.uuid """
        )

        for row in c:
@@ -1031,8 +1154,6 @@ class PhotosDB:
                INNER JOIN RKMaster on RKVersion.masterUuid = RKMaster.uuid 
                INNER JOIN RKModelResource on RKMaster.modelId = RKModelResource.attachedModelId  
                WHERE RKModelResource.UTI = 'com.apple.quicktime-movie'
-				AND RKMaster.isInTrash = 0
-                AND RKVersion.isInTrash = 0 
              """
        )

@@ -1196,8 +1317,8 @@ class PhotosDB:
            logging.debug("Faces (_dbfaces_uuid):")
            logging.debug(pformat(self._dbfaces_uuid))

-            logging.debug("Faces by person (_dbfaces_person):")
-            logging.debug(pformat(self._dbfaces_person))
+            logging.debug("Persons (_dbpersons_pk):")
+            logging.debug(pformat(self._dbpersons_pk))

            logging.debug("Keywords by uuid (_dbkeywords_uuid):")
            logging.debug(pformat(self._dbkeywords_uuid))
@@ -1258,8 +1379,12 @@ class PhotosDB:
        return folders

    def _process_database5(self):
-        """ process the Photos database to extract info """
-        """ works on Photos version >= 5.0 """
+        """ process the Photos database to extract info 
+            works on Photos version >= 5.0 
+
+            This is a big hairy 700 line function that should probably be refactored
+            but it works so don't touch it.
+        """

        if _debug():
            logging.debug(f"_process_database5")
@@ -1273,47 +1398,107 @@ class PhotosDB:
        if _debug():
            logging.debug(f"Getting information about persons")

+        # get info to associate persons with photos
+        # then get detected faces in each photo and link to persons
        c.execute(
-            "SELECT ZPERSON.ZFULLNAME, ZGENERICASSET.ZUUID "
-            "FROM ZPERSON, ZDETECTEDFACE, ZGENERICASSET "
-            "WHERE ZDETECTEDFACE.ZPERSON = ZPERSON.Z_PK AND ZDETECTEDFACE.ZASSET = ZGENERICASSET.Z_PK "
-            "AND ZGENERICASSET.ZTRASHEDSTATE = 0"
+            """ SELECT
+                ZPERSON.Z_PK,
+                ZPERSON.ZPERSONUUID,
+                ZPERSON.ZFULLNAME,
+                ZPERSON.ZFACECOUNT,
+                ZPERSON.ZKEYFACE,
+                ZPERSON.ZDISPLAYNAME
+                FROM ZPERSON
+            """
        )
+
+        # 0     ZPERSON.Z_PK,
+        # 1     ZPERSON.ZPERSONUUID,
+        # 2     ZPERSON.ZFULLNAME,
+        # 3     ZPERSON.ZFACECOUNT,
+        # 4     ZPERSON.ZKEYFACE,
+        # 5     ZPERSON.ZDISPLAYNAME,
+
        for person in c:
-            if person[0] is None:
-                continue
-            person_name = person[0] if person[0] != "" else _UNKNOWN_PERSON
-            if not person[1] in self._dbfaces_uuid:
-                self._dbfaces_uuid[person[1]] = []
-            if not person_name in self._dbfaces_person:
-                self._dbfaces_person[person_name] = []
-            self._dbfaces_uuid[person[1]].append(person_name)
-            self._dbfaces_person[person_name].append(person[1])
+            pk = person[0]
+            fullname = person[2] if person[2] != "" else _UNKNOWN_PERSON
+            self._dbpersons_pk[pk] = {
+                "pk": pk,
+                "uuid": person[1],
+                "fullname": fullname,
+                "facecount": person[3],
+                "keyface": person[4],
+                "displayname": person[5],
+            }
+            try:
+                self._dbpersons_fullname[fullname].append(pk)
+            except KeyError:
+                self._dbpersons_fullname[fullname] = [pk]
+
+        # get information on detected faces
+        c.execute(
+            """ SELECT
+                ZPERSON.Z_PK,
+                ZGENERICASSET.ZUUID
+                FROM ZPERSON, ZDETECTEDFACE, ZGENERICASSET
+                WHERE ZDETECTEDFACE.ZPERSON = ZPERSON.Z_PK AND
+                ZDETECTEDFACE.ZASSET = ZGENERICASSET.Z_PK;
+            """
+        )
+
+        # 0     ZPERSON.Z_PK,
+        # 1     ZGENERICASSET.ZUUID,
+
+        for face in c:
+            pk = face[0]
+            uuid = face[1]
+            try:
+                self._dbfaces_uuid[uuid].append(pk)
+            except KeyError:
+                self._dbfaces_uuid[uuid] = [pk]
+
+            try:
+                self._dbfaces_pk[pk].append(uuid)
+            except KeyError:
+                self._dbfaces_pk[pk] = [uuid]

        if _debug():
            logging.debug(f"Finished walking through persons")
-            logging.debug(pformat(self._dbfaces_person))
-            logging.debug(self._dbfaces_uuid)
+            logging.debug(pformat(self._dbpersons_pk))
+            logging.debug(pformat(self._dbpersons_fullname))
+            logging.debug(pformat(self._dbfaces_pk))
+            logging.debug(pformat(self._dbfaces_uuid))

        # get details about albums
        c.execute(
-            "SELECT ZGENERICALBUM.ZUUID, ZGENERICASSET.ZUUID "
-            "FROM ZGENERICASSET "
-            "JOIN Z_26ASSETS ON Z_26ASSETS.Z_34ASSETS = ZGENERICASSET.Z_PK "
-            "JOIN ZGENERICALBUM ON ZGENERICALBUM.Z_PK = Z_26ASSETS.Z_26ALBUMS "
-            "WHERE ZGENERICASSET.ZTRASHEDSTATE = 0 "
+            """ SELECT 
+                ZGENERICALBUM.ZUUID, 
+                ZGENERICASSET.ZUUID,
+				Z_26ASSETS.Z_FOK_34ASSETS
+                FROM ZGENERICASSET 
+                JOIN Z_26ASSETS ON Z_26ASSETS.Z_34ASSETS = ZGENERICASSET.Z_PK 
+                JOIN ZGENERICALBUM ON ZGENERICALBUM.Z_PK = Z_26ASSETS.Z_26ALBUMS
+            """
        )
+
+        # 0     ZGENERICALBUM.ZUUID,
+        # 1     ZGENERICASSET.ZUUID,
+        # 2	    Z_26ASSETS.Z_FOK_34ASSETS
+
        for album in c:
            # store by uuid in _dbalbums_uuid and by album in _dbalbums_album
+            album_uuid = album[0]
+            photo_uuid = album[1]
+            sort_order = album[2]
            try:
-                self._dbalbums_uuid[album[1]].append(album[0])
+                self._dbalbums_uuid[photo_uuid].append(album_uuid)
            except KeyError:
-                self._dbalbums_uuid[album[1]] = [album[0]]
+                self._dbalbums_uuid[photo_uuid] = [album_uuid]

            try:
-                self._dbalbums_album[album[0]].append(album[1])
+                self._dbalbums_album[album_uuid].append((photo_uuid, sort_order))
            except KeyError:
-                self._dbalbums_album[album[0]] = [album[1]]
+                self._dbalbums_album[album_uuid] = [(photo_uuid, sort_order)]

        # now get additional details about albums
        c.execute(
@@ -1403,7 +1588,6 @@ class PhotosDB:
            "JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK "
            "JOIN Z_1KEYWORDS ON Z_1KEYWORDS.Z_1ASSETATTRIBUTES = ZADDITIONALASSETATTRIBUTES.Z_PK "
            "JOIN ZKEYWORD ON ZKEYWORD.Z_PK = Z_1KEYWORDS.Z_37KEYWORDS "
-            "WHERE ZGENERICASSET.ZTRASHEDSTATE = 0 "
        )
        for keyword in c:
            if not keyword[1] in self._dbkeywords_uuid:
@@ -1457,10 +1641,17 @@ class PhotosDB:
                ZGENERICASSET.ZCLOUDASSETGUID,
                ZADDITIONALASSETATTRIBUTES.ZREVERSELOCATIONDATA,
                ZGENERICASSET.ZMOMENT,
-	            ZADDITIONALASSETATTRIBUTES.ZORIGINALRESOURCECHOICE
+	            ZADDITIONALASSETATTRIBUTES.ZORIGINALRESOURCECHOICE,
+                ZGENERICASSET.ZTRASHEDSTATE,
+                ZGENERICASSET.ZHEIGHT, 
+                ZGENERICASSET.ZWIDTH, 
+                ZGENERICASSET.ZORIENTATION, 
+                ZADDITIONALASSETATTRIBUTES.ZORIGINALHEIGHT, 
+                ZADDITIONALASSETATTRIBUTES.ZORIGINALWIDTH, 
+                ZADDITIONALASSETATTRIBUTES.ZORIGINALORIENTATION,
+                ZADDITIONALASSETATTRIBUTES.ZORIGINALFILESIZE
                FROM ZGENERICASSET 
                JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK 
-                WHERE ZGENERICASSET.ZTRASHEDSTATE = 0  
                ORDER BY ZGENERICASSET.ZUUID  """
        )
        # Order of results
@@ -1493,6 +1684,14 @@ class PhotosDB:
        # 25   ZADDITIONALASSETATTRIBUTES.ZREVERSELOCATIONDATA -- reverse geolocation data
        # 26   ZGENERICASSET.ZMOMENT -- FK for ZMOMENT.Z_PK
        # 27   ZADDITIONALASSETATTRIBUTES.ZORIGINALRESOURCECHOICE -- 1 if associated RAW image is original else 0
+        # 28   ZGENERICASSET.ZTRASHEDSTATE -- 0 if not in trash, 1 if in trash
+        # 29   ZGENERICASSET.ZHEIGHT,
+        # 30   ZGENERICASSET.ZWIDTH,
+        # 31   ZGENERICASSET.ZORIENTATION,
+        # 32   ZADDITIONALASSETATTRIBUTES.ZORIGINALHEIGHT,
+        # 33   ZADDITIONALASSETATTRIBUTES.ZORIGINALWIDTH,
+        # 34   ZADDITIONALASSETATTRIBUTES.ZORIGINALORIENTATION,
+        # 35   ZADDITIONALASSETATTRIBUTES.ZORIGINALFILESIZE

        for row in c:
            uuid = row[0]
@@ -1516,7 +1715,7 @@ class PhotosDB:
            try:
                info["imageDate"] = datetime.fromtimestamp(row[5] + td)
            except ValueError:
-                info["imageDate"] = datetime.date(1970, 1, 1)
+                info["imageDate"] = datetime(1970, 1, 1)

            info["imageTimeZoneOffsetSeconds"] = row[6]
            info["hidden"] = row[9]
@@ -1641,6 +1840,18 @@ class PhotosDB:
            info["original_resource_choice"] = row[27]
            info["raw_is_original"] = True if row[27] == 1 else False

+            # recently deleted items
+            info["intrash"] = True if row[28] == 1 else False
+
+            # height/width/orientation
+            info["height"] = row[29]
+            info["width"] = row[30]
+            info["orientation"] = row[31]
+            info["original_height"] = row[32]
+            info["original_width"] = row[33]
+            info["original_orientation"] = row[34]
+            info["original_filesize"] = row[35]
+
            # associated RAW image info
            # will be filled in later
            info["has_raw"] = False
@@ -1694,7 +1905,6 @@ class PhotosDB:
            "FROM ZGENERICASSET, ZUNMANAGEDADJUSTMENT "
            "JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK "
            "WHERE ZADDITIONALASSETATTRIBUTES.ZUNMANAGEDADJUSTMENT = ZUNMANAGEDADJUSTMENT.Z_PK "
-            "AND ZGENERICASSET.ZTRASHEDSTATE = 0 "
        )
        for row in c:
            uuid = row[0]
@@ -1861,8 +2071,8 @@ class PhotosDB:
            logging.debug("Faces (_dbfaces_uuid):")
            logging.debug(pformat(self._dbfaces_uuid))

-            logging.debug("Faces by person (_dbfaces_person):")
-            logging.debug(pformat(self._dbfaces_person))
+            logging.debug("Persons (_dbpersons_pk):")
+            logging.debug(pformat(self._dbpersons_pk))

            logging.debug("Keywords by uuid (_dbkeywords_uuid):")
            logging.debug(pformat(self._dbkeywords_uuid))
@@ -2142,9 +2352,10 @@ class PhotosDB:
        persons=None,
        albums=None,
        images=True,
-        movies=False,
+        movies=True,
        from_date=None,
        to_date=None,
+        intrash=False,
    ):
        """ 
        Return a list of PhotoInfo objects
@@ -2158,9 +2369,11 @@ class PhotosDB:
        persons: list of persons to search for
        albums: list of album names to search for
        images: if True, returns image files, if False, does not return images; default is True
-        movies: if True, returns movie files, if False, does not return movies; default is False
+        movies: if True, returns movie files, if False, does not return movies; default is True 
        from_date: return photos with creation date >= from_date (datetime.datetime object, default None)
        to_date: return photos with creation date <= to_date (datetime.datetime object, default None)
+        intrash: if True, returns only images in "Recently deleted items" folder, 
+                 if False returns only photos that aren't deleted; default is False
        """

        # implementation is a bit kludgy but it works
@@ -2168,6 +2381,15 @@ class PhotosDB:
        # use results to build a list of PhotoInfo objects

        photos_sets = []  # list of photo sets to perform intersection of
+        if intrash:
+            photos_sets.append(
+                {p for p in self._dbphotos if self._dbphotos[p]["intrash"]}
+            )
+        else:
+            photos_sets.append(
+                {p for p in self._dbphotos if not self._dbphotos[p]["intrash"]}
+            )
+
        if not any([keywords, uuid, persons, albums, from_date, to_date]):
            # return all the photos, filtering for images and movies
            # append keys of all photos as a single set to photos_sets
@@ -2176,13 +2398,14 @@ class PhotosDB:
            if albums:
                album_set = set()
                for album in albums:
-                    # TODO: can have >1 album with same name. This globs them together.
-                    # Need a way to select which album?
+                    # glob together albums with same name
                    if album in self._dbalbum_titles:
                        title_set = set()
                        for album_id in self._dbalbum_titles[album]:
                            try:
-                                title_set.update(self._dbalbums_album[album_id])
+                                # _dbalbums_album value is list of tuples: [(uuid, sort order)]
+                                uuid_in_album, _ = zip(*self._dbalbums_album[album_id])
+                                title_set.update(uuid_in_album)
                            except KeyError:
                                # an empty album will be in _dbalbum_titles but not _dbalbums_album
                                pass
@@ -2212,13 +2435,14 @@ class PhotosDB:
            if persons:
                person_set = set()
                for person in persons:
-                    if person in self._dbfaces_person:
-                        person_set.update(self._dbfaces_person[person])
+                    if person in self._dbpersons_fullname:
+                        for pk in self._dbpersons_fullname[person]:
+                            person_set.update(self._dbfaces_pk[pk])
                    else:
                        logging.debug(f"Could not find person '{person}' in database")
                photos_sets.append(person_set)

-            if from_date or to_date:
+            if from_date or to_date:  # sourcery off
                dsel = self._dbphotos
                if from_date:
                    dsel = {
@@ -2235,7 +2459,6 @@ class PhotosDB:
        photoinfo = []
        if photos_sets:  # found some photos
            # get the intersection of each argument/search criteria
-            logging.debug(f"Got photo_sets: {photos_sets}")
            for p in set.intersection(*photos_sets):
                # filter for non-selected burst photos
                if self._dbphotos[p]["burst"] and not self._dbphotos[p]["burst_key"]:
@@ -2264,5 +2487,7 @@ class PhotosDB:
        return False

    def __len__(self):
-        """ returns number of photos in the database """
+        """ Returns number of photos in the database
+            Includes recently deleted photos and non-selected burst images
+        """
        return len(self._dbphotos)
--- a/osxphotos/phototemplate.py
+++ b/osxphotos/phototemplate.py
@@ -9,6 +9,7 @@
 # 4. Couldn't figure out how to do #1 and #2 with str.format()
 #
 # This code isn't elegant but it seems to work well.  PRs gladly accepted.
+import datetime
 import locale
 import os
 import re
@@ -59,6 +60,23 @@ TEMPLATE_SUBSTITUTIONS = {
    # + "{modified.strftime,%Y-%U} would result in year-week number of year: '2020-23'. "
    # + "If used with no template will return null value. "
    # + "See https://strftime.org/ for help on strftime templates.",
+    "{today.date}": "Current date in iso format, e.g. '2020-03-22'",
+    "{today.year}": "4-digit year of current date",
+    "{today.yy}": "2-digit year of current date",
+    "{today.mm}": "2-digit month of the current date (zero padded)",
+    "{today.month}": "Month name in user's locale of the current date",
+    "{today.mon}": "Month abbreviation in the user's locale of the current date",
+    "{today.dd}": "2-digit day of the month (zero padded) of current date",
+    "{today.dow}": "Day of week in user's locale of the current date",
+    "{today.doy}": "3-digit day of year (e.g Julian day) of current date, starting from 1 (zero padded)",
+    "{today.hour}": "2-digit hour of the current date",
+    "{today.min}": "2-digit minute of the current date",
+    "{today.sec}": "2-digit second of the current date",
+    "{today.strftime}": "Apply strftime template to current date/time. Should be used in form "
+    + "{today.strftime,TEMPLATE} where TEMPLATE is a valid strftime template, e.g. "
+    + "{today.strftime,%Y-%U} would result in year-week number of year: '2020-23'. "
+    + "If used with no template will return null value. "
+    + "See https://strftime.org/ for help on strftime templates.",
    "{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",
    "{place.name.country}": "Country name from the photo's reverse geolocation data",
@@ -102,13 +120,28 @@ class PhotoTemplate:
        """
        self.photo = photo

-    def render(self, template, none_str="_", path_sep=None):
+        # holds value of current date/time for {today.x} fields
+        # gets initialized in get_template_value
+        self.today = None
+
+    def render(
+        self,
+        template,
+        none_str="_",
+        path_sep=None,
+        expand_inplace=False,
+        inplace_sep=None,
+    ):
        """ Render a filename or directory template 

        Args:
            template: str template 
            none_str: str to use default for None values, default is '_' 
            path_sep: optional character to use as path separator, default is os.path.sep
+            expand_inplace: expand multi-valued substitutions in-place as a single string 
+                instead of returning individual strings
+            inplace_sep: optional string to use as separator between multi-valued keywords
+            with expand_inplace; default is ','

        Returns:
            ([rendered_strings], [unmatched]): tuple of list of rendered strings and list of unmatched template values
@@ -119,6 +152,9 @@ class PhotoTemplate:
        elif path_sep is not None and len(path_sep) != 1:
            raise ValueError(f"path_sep must be single character: {path_sep}")

+        if inplace_sep is None:
+            inplace_sep = ","
+
        # the rendering happens in two phases:
        # phase 1: handle all the single-value template substitutions
        #          results in a single string with all the template fields replaced
@@ -204,13 +240,19 @@ class PhotoTemplate:
            for str_template in rendered_strings:
                if regex_multi.search(str_template):
                    values = self.get_template_value_multi(field, path_sep)
-                    for val in values:
+                    if expand_inplace:
+                        # instead of returning multiple strings, join values into a single string
+                        val = (
+                            inplace_sep.join(sorted(values))
+                            if values and values[0]
+                            else None
+                        )

                        def lookup_template_value_multi(lookup_value, default):
                            """ Closure passed to make_subst_function get_func 
-                                Capture val and field in the closure 
-                                Allows make_subst_function to be re-used w/o modification
-                                default is not used but required so signature matches get_template_value """
+                                    Capture val and field in the closure 
+                                    Allows make_subst_function to be re-used w/o modification
+                                    default is not used but required so signature matches get_template_value """
                            if lookup_value == field:
                                return val
                            else:
@@ -220,10 +262,33 @@ class PhotoTemplate:
                            self, none_str, get_func=lookup_template_value_multi
                        )
                        new_string = regex_multi.sub(subst, str_template)
-                        new_strings.add(new_string)

-                    # update rendered_strings for the next field to process
-                    rendered_strings = new_strings
+                        # update rendered_strings for the next field to process
+                        rendered_strings = {new_string}
+                    else:
+                        # create a new template string for each value
+                        for val in values:
+
+                            def lookup_template_value_multi(lookup_value, default):
+                                """ Closure passed to make_subst_function get_func 
+                                    Capture val and field in the closure 
+                                    Allows make_subst_function to be re-used w/o modification
+                                    default is not used but required so signature matches get_template_value """
+                                if lookup_value == field:
+                                    return val
+                                else:
+                                    raise ValueError(
+                                        f"Unexpected value: {lookup_value}"
+                                    )
+
+                            subst = make_subst_function(
+                                self, none_str, get_func=lookup_template_value_multi
+                            )
+                            new_string = regex_multi.sub(subst, str_template)
+                            new_strings.add(new_string)
+
+                        # update rendered_strings for the next field to process
+                        rendered_strings = new_strings

        # find any {fields} that weren't replaced
        unmatched = []
@@ -258,6 +323,10 @@ class PhotoTemplate:
            ValueError if no rule exists for field.
        """

+        # initialize today with current date/time if needed
+        if self.today is None:
+            self.today = datetime.datetime.now()
+
        # must be a valid keyword
        if field == "name":
            return pathlib.Path(self.photo.filename).stem
@@ -404,6 +473,51 @@ class PhotoTemplate:
        #     else:
        #         return None

+        if field == "today.date":
+            return DateTimeFormatter(self.today).date
+
+        if field == "today.year":
+            return DateTimeFormatter(self.today).year
+
+        if field == "today.yy":
+            return DateTimeFormatter(self.today).yy
+
+        if field == "today.mm":
+            return DateTimeFormatter(self.today).mm
+
+        if field == "today.month":
+            return DateTimeFormatter(self.today).month
+
+        if field == "today.mon":
+            return DateTimeFormatter(self.today).mon
+
+        if field == "today.dd":
+            return DateTimeFormatter(self.today).dd
+
+        if field == "today.dow":
+            return DateTimeFormatter(self.today).dow
+
+        if field == "today.doy":
+            return DateTimeFormatter(self.today).doy
+
+        if field == "today.hour":
+            return DateTimeFormatter(self.today).hour
+
+        if field == "today.min":
+            return DateTimeFormatter(self.today).min
+
+        if field == "today.sec":
+            return DateTimeFormatter(self.today).sec
+
+        if field == "today.strftime":
+            if default:
+                try:
+                    return self.today.strftime(default)
+                except:
+                    raise ValueError(f"Invalid strftime template: '{default}'")
+            else:
+                return None
+
        if field == "place.name":
            return self.photo.place.name if self.photo.place else None

--- a/osxphotos/placeinfo.py
+++ b/osxphotos/placeinfo.py
@@ -503,7 +503,6 @@ class PlaceInfo5(PlaceInfo):
        """ revgeoloc_bplist: a binary plist blob containing 
                a serialized PLRevGeoLocationInfo object """
        self._bplist = revgeoloc_bplist
-        # todo: check for None?
        self._plrevgeoloc = archiver.unarchive(revgeoloc_bplist)
        self._process_place_info()

@@ -535,16 +534,23 @@ class PlaceInfo5(PlaceInfo):
    @property
    def address(self):
        addr = self._plrevgeoloc.postalAddress
-        return PostalAddress(
-            street=addr._street,
-            sub_locality=addr._subLocality,
-            city=addr._city,
-            sub_administrative_area=addr._subAdministrativeArea,
-            state_province=addr._state,
-            postal_code=addr._postalCode,
-            country=addr._country,
-            iso_country_code=addr._ISOCountryCode,
-        )
+        if addr is not None:
+            postal_address = PostalAddress(
+                street=addr._street,
+                sub_locality=addr._subLocality,
+                city=addr._city,
+                sub_administrative_area=addr._subAdministrativeArea,
+                state_province=addr._state,
+                postal_code=addr._postalCode,
+                country=addr._country,
+                iso_country_code=addr._ISOCountryCode,
+            )
+        else:
+            postal_address = PostalAddress(
+                None, None, None, None, None, None, None, None
+            )
+
+        return postal_address

    def _process_place_info(self):
        """ Process sortedPlaceInfos to set self._name and self._names """
@@ -632,5 +638,5 @@ class PlaceInfo5(PlaceInfo):
            "country_code": self.country_code,
            "ishome": self.ishome,
            "address_str": self.address_str,
-            "address": self.address._asdict(),
+            "address": self.address._asdict() if self.address is not None else None,
        }
--- a/osxphotos/templates/xmp_sidecar.mako
+++ b/osxphotos/templates/xmp_sidecar.mako
@@ -71,29 +71,42 @@
    % endif
 </%def>

+<%def name="gps_info(latitude, longitude)">
+    % if latitude is not None and longitude is not None:
+        <exif:GPSLongitudeRef>${"E" if longitude >= 0 else "W"}</exif:GPSLongitudeRef>
+        <exif:GPSLongitude>${abs(longitude)}</exif:GPSLongitude>
+        <exif:GPSLatitude>${abs(latitude)}</exif:GPSLatitude>
+        <exif:GPSLatitudeRef>${"N" if latitude >= 0 else "S"}</exif:GPSLatitudeRef>
+    % endif
+</%def>
+
 <x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
    <!-- mirrors Photos 5 "Export IPTC as XMP" option -->
    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
        <rdf:Description rdf:about="" 
            xmlns:dc="http://purl.org/dc/elements/1.1/" 
            xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
-            ${dc_description(photo.description)}
+            ${dc_description(description)}
            ${dc_title(photo.title)}
            ${dc_subject(subjects)}
            ${dc_datecreated(photo.date)}
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about=""  
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
            ${iptc_personinimage(persons)}
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
            ${dk_tagslist(keywords)}
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
            ${adobe_createdate(photo.date)}
            ${adobe_modifydate(photo.date)}
        </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+            ${gps_info(*photo.location)}
+        </rdf:Description>
   </rdf:RDF>
 </x:xmpmeta>
--- a/tests/Test-10.14.6.photoslibrary/Masters/2020/06/27/20200627-160436/IMG_1064.jpeg
+++ b/tests/Test-10.14.6.photoslibrary/Masters/2020/06/27/20200627-160436/IMG_1064.jpeg
--- a/tests/Test-10.14.6.photoslibrary/database/RKVersion_searchIndexText.skindex
+++ b/tests/Test-10.14.6.photoslibrary/database/RKVersion_searchIndexText.skindex
--- a/tests/Test-10.14.6.photoslibrary/database/photos
+++ b/tests/Test-10.14.6.photoslibrary/database/photos
--- a/tests/Test-10.14.6.photoslibrary/database/photos.db
+++ b/tests/Test-10.14.6.photoslibrary/database/photos.db
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotoAnalysisServicePreferences.plist
@@ -5,6 +5,6 @@
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
 	<date>2020-04-25T23:54:43Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-04-26T06:26:10Z</date>
+	<date>2020-07-06T16:39:04Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/construction-photosgraph.graphdb-shm
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/construction-photosgraph.graphdb-shm
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/liveupdate-photosgraph.graphdb
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/liveupdate-photosgraph.graphdb
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph-tmp.graphdb-shm
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph-tmp.graphdb-shm
--- a/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
+++ b/tests/Test-10.14.6.photoslibrary/private/com.apple.photoanalysisd/GraphService/PhotosGraph/photosgraph.graphdb
--- a/tests/Test-10.14.6.photoslibrary/resources/moments/analysismetadata.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/moments/analysismetadata.plist
@@ -11,6 +11,6 @@
 	<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
 	<integer>1</integer>
 	<key>PLLastRevGeoVerFileFetchDateKey</key>
-	<date>2020-04-25T23:54:29Z</date>
+	<date>2020-07-06T16:39:09Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.14.6.photoslibrary/resources/moments/historicalmarker.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/moments/historicalmarker.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>LastHistoryRowId</key>
-	<integer>606</integer>
+	<integer>664</integer>
 	<key>LibraryBuildTag</key>
 	<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 	<key>LibrarySchemaVersion</key>
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_mini_8.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_mini_8.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_thumb_8.jpg
+++ b/tests/Test-10.14.6.photoslibrary/resources/proxies/derivatives/00/00/8/UNADJUSTEDNONRAW_thumb_8.jpg
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/Info.plist
@@ -9,7 +9,7 @@
 	<key>HistoricalMarker</key>
 	<dict>
 		<key>LastHistoryRowId</key>
-		<integer>606</integer>
+		<integer>664</integer>
 		<key>LibraryBuildTag</key>
 		<string>D8C4AAA1-3AB6-4A65-BEBD-99CC3E5D433E</string>
 		<key>LibrarySchemaVersion</key>
@@ -24,7 +24,7 @@
 	<key>SnapshotCompletedDate</key>
 	<date>2019-07-27T13:16:43Z</date>
 	<key>SnapshotLastValidated</key>
-	<date>2020-04-25T23:56:35Z</date>
+	<date>2020-07-06T16:39:02Z</date>
 	<key>SnapshotTables</key>
 	<dict/>
 </dict>
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKAlbum/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKCustomSortOrder/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImageProxyState/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImportGroup/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKImportGroup/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKMaster/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKMaster/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKPlace/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKPlace/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKPlaceForVersion/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKPlaceForVersion/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersion/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
+++ b/tests/Test-10.14.6.photoslibrary/resources/recovery/RKVersionAnalysisState/0000000000.lij
--- a/tests/Test-10.14.6.photoslibrary/resources/segments/Thumb64Segment_0.data
+++ b/tests/Test-10.14.6.photoslibrary/resources/segments/Thumb64Segment_0.data
--- a/tests/Test-10.14.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
+++ b/tests/Test-10.14.6.photoslibrary/resources/segments/ThumbJPGSegment_0.data
--- a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite
+++ b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite
--- a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-shm
+++ b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-shm
--- a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-wal
+++ b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite-wal
--- a/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite.lock
+++ b/tests/Test-10.15.5.photoslibrary/database/Photos.sqlite.lock
@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>703</integer>
+	<integer>1743</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>
--- a/tests/Test-10.15.5.photoslibrary/database/search/psi.sqlite
+++ b/tests/Test-10.15.5.photoslibrary/database/search/psi.sqlite
--- a/tests/Test-10.15.5.photoslibrary/database/search/synonymsProcess.plist
+++ b/tests/Test-10.15.5.photoslibrary/database/search/synonymsProcess.plist
--- a/tests/Test-10.15.5.photoslibrary/originals/6/6FD38366-3BF2-407D-81FE-7153EB6125B6.jpeg
+++ b/tests/Test-10.15.5.photoslibrary/originals/6/6FD38366-3BF2-407D-81FE-7153EB6125B6.jpeg
--- a/tests/Test-10.15.5.photoslibrary/originals/7/71E3E212-00EB-430D-8A63-5E294B268554.jpeg
+++ b/tests/Test-10.15.5.photoslibrary/originals/7/71E3E212-00EB-430D-8A63-5E294B268554.jpeg
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.Photos/appPrivateData.plist
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.Photos/appPrivateData.plist
@@ -10,6 +10,7 @@
 		<string>88A5F8B8-5B9A-43C7-BB85-3952B81580EB/L0/020</string>
 		<string>29EF7A97-7E76-4D5F-A5E0-CC0A93E8524C/L0/020</string>
 		<string>2C2AF115-BD1D-4434-A747-D1C8BD8E2045/L0/020</string>
+		<string>CB051A4C-2CB7-4B90-B59B-08CC4D0C2823/L0/020</string>
 	</array>
 	<key>Photos</key>
 	<dict>
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-shm
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSLocationCache.sqlite-wal
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist
@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
 	<key>BackgroundHighlightCollection</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2020-06-06T14:26:29Z</date>
+	<date>2020-06-24T04:02:12Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2020-06-06T14:26:29Z</date>
+	<date>2020-06-24T04:02:12Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
 	<date>2020-05-30T02:16:06Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
 	<date>2020-05-29T04:31:37Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-06-06T14:26:33Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2020-06-06T14:26:31Z</date>
+	<date>2020-06-24T04:02:13Z</date>
 </dict>
 </plist>
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb
--- a/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
+++ b/tests/Test-10.15.5.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist
--- a/tests/Test-10.15.5.photoslibrary/resources/derivatives/6/6FD38366-3BF2-407D-81FE-7153EB6125B6_1_105_c.jpeg
+++ b/tests/Test-10.15.5.photoslibrary/resources/derivatives/6/6FD38366-3BF2-407D-81FE-7153EB6125B6_1_105_c.jpeg
--- a/tests/Test-10.15.5.photoslibrary/resources/derivatives/7/71E3E212-00EB-430D-8A63-5E294B268554_1_105_c.jpeg
+++ b/tests/Test-10.15.5.photoslibrary/resources/derivatives/7/71E3E212-00EB-430D-8A63-5E294B268554_1_105_c.jpeg
--- a/tests/Test-10.15.5.photoslibrary/resources/derivatives/masters/6/6FD38366-3BF2-407D-81FE-7153EB6125B6_4_5005_c.jpeg
+++ b/tests/Test-10.15.5.photoslibrary/resources/derivatives/masters/6/6FD38366-3BF2-407D-81FE-7153EB6125B6_4_5005_c.jpeg
--- a/tests/Test-10.15.5.photoslibrary/resources/derivatives/masters/7/71E3E212-00EB-430D-8A63-5E294B268554_4_5005_c.jpeg
+++ b/tests/Test-10.15.5.photoslibrary/resources/derivatives/masters/7/71E3E212-00EB-430D-8A63-5E294B268554_4_5005_c.jpeg
--- a/tests/Test-10.15.5.photoslibrary/resources/derivatives/thumbs/3305.ithmb
+++ b/tests/Test-10.15.5.photoslibrary/resources/derivatives/thumbs/3305.ithmb
--- a/tests/Test-10.15.5.photoslibrary/resources/derivatives/thumbs/4031.ithmb
+++ b/tests/Test-10.15.5.photoslibrary/resources/derivatives/thumbs/4031.ithmb
--- a/tests/Test-10.15.5.photoslibrary/resources/derivatives/thumbs/4132.ithmb
+++ b/tests/Test-10.15.5.photoslibrary/resources/derivatives/thumbs/4132.ithmb
--- a/tests/Test-10.15.5.photoslibrary/resources/journals/Album-change.plj
+++ b/tests/Test-10.15.5.photoslibrary/resources/journals/Album-change.plj
--- a/tests/Test-10.15.5.photoslibrary/resources/journals/Asset-change.plj
+++ b/tests/Test-10.15.5.photoslibrary/resources/journals/Asset-change.plj
--- a/tests/Test-10.15.5.photoslibrary/resources/journals/DetectedFace-change.plj
+++ b/tests/Test-10.15.5.photoslibrary/resources/journals/DetectedFace-change.plj
--- a/tests/Test-10.15.5.photoslibrary/resources/journals/HistoryToken.plist
+++ b/tests/Test-10.15.5.photoslibrary/resources/journals/HistoryToken.plist
--- a/tests/Test-10.15.5.photoslibrary/resources/journals/ImportSession-change.plj
+++ b/tests/Test-10.15.5.photoslibrary/resources/journals/ImportSession-change.plj
--- a/tests/Test-10.15.5.photoslibrary/resources/journals/Person-change.plj
+++ b/tests/Test-10.15.5.photoslibrary/resources/journals/Person-change.plj
--- a/tests/test_10_12_6.py
+++ b/tests/test_10_12_6.py
@@ -1,7 +1,6 @@
 import pytest

-# TODO: put some of this code into a pre-function
-# TODO: All the hardocded uuids, etc in test functions should be in some sort of config
+from osxphotos._constants import _UNKNOWN_PERSON

 PHOTOS_DB = "./tests/Test-10.12.6.photoslibrary/database/photos.db"
 KEYWORDS = [
@@ -15,7 +14,7 @@ KEYWORDS = [
    "UK",
    "United Kingdom",
 ]
-PERSONS = ["Katie", "Suzy", "Maria"]
+PERSONS = ["Katie", "Suzy", "Maria", _UNKNOWN_PERSON]
 ALBUMS = ["Pumpkin Farm", "AlbumInFolder"]
 KEYWORDS_DICT = {
    "Kids": 4,
@@ -28,7 +27,7 @@ KEYWORDS_DICT = {
    "UK": 1,
    "United Kingdom": 1,
 }
-PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1}
+PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, _UNKNOWN_PERSON: 1}
 ALBUM_DICT = {"Pumpkin Farm": 3, "AlbumInFolder": 1}


--- a/tests/test_catalina_10_15_5.py
+++ b/tests/test_catalina_10_15_5.py
@@ -7,7 +7,9 @@ PHOTOS_DB = "tests/Test-10.15.5.photoslibrary/database/photos.db"
 PHOTOS_DB_PATH = "/Test-10.15.5.photoslibrary/database/photos.db"
 PHOTOS_LIBRARY_PATH = "/Test-10.15.5.photoslibrary"

-PHOTOS_DB_LEN = 13
+PHOTOS_DB_LEN = 15
+PHOTOS_NOT_IN_TRASH_LEN = 13
+PHOTOS_IN_TRASH_LEN = 2

 KEYWORDS = [
    "Kids",
@@ -32,7 +34,7 @@ ALBUMS = [
 ]
 KEYWORDS_DICT = {
    "Kids": 4,
-    "wedding": 2,
+    "wedding": 3,
    "flowers": 1,
    "England": 1,
    "London": 1,
@@ -41,7 +43,7 @@ KEYWORDS_DICT = {
    "UK": 1,
    "United Kingdom": 1,
 }
-PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, _UNKNOWN_PERSON: 1}
+PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 2, _UNKNOWN_PERSON: 1}
 ALBUM_DICT = {
    "Pumpkin Farm": 3,
    "Test Album": 2,
@@ -66,6 +68,10 @@ UUID_DICT = {
    "export": "D79B8D77-BFFC-460B-9312-034F2877D35B",  # "Pumkins2.jpg"
    "export_tif": "8846E3E6-8AC8-4857-8448-E3D025784410",
    "in_album": "D79B8D77-BFFC-460B-9312-034F2877D35B",  # "Pumkins2.jpg"
+    "date_invalid": "8846E3E6-8AC8-4857-8448-E3D025784410",
+    "intrash": "71E3E212-00EB-430D-8A63-5E294B268554",
+    "not_intrash": "DC99FBDD-7A52-4100-A5BB-344131646C30",
+    "intrash_person_keywords": "6FD38366-3BF2-407D-81FE-7153EB6125B6",
 }

 UUID_PUMPKIN_FARM = [
@@ -74,6 +80,12 @@ UUID_PUMPKIN_FARM = [
    "1EB2B765-0765-43BA-A90C-0D0580E6172C",
 ]

+ALBUM_SORT_ORDER = [
+"1EB2B765-0765-43BA-A90C-0D0580E6172C",
+"F12384F6-CD17-4151-ACBA-AE0E3688539E",
+"D79B8D77-BFFC-460B-9312-034F2877D35B",
+]
+ALBUM_KEY_PHOTO = "D79B8D77-BFFC-460B-9312-034F2877D35B"

 def test_init1():
    # test named argument
@@ -190,7 +202,7 @@ def test_keywords_dict():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    keywords = photosdb.keywords_as_dict
-    assert keywords["wedding"] == 2
+    assert keywords["wedding"] == 3
    assert keywords == KEYWORDS_DICT


@@ -199,7 +211,7 @@ def test_persons_as_dict():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    persons = photosdb.persons_as_dict
-    assert persons["Maria"] == 1
+    assert persons["Maria"] == 2
    assert persons == PERSONS_DICT


@@ -211,6 +223,15 @@ def test_albums_as_dict():
    assert albums["Pumpkin Farm"] == 3
    assert albums == ALBUM_DICT

+def test_album_sort_order():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    album = [a for a in photosdb.album_info if a.title == "Pumpkin Farm"][0]
+    photos = album.photos
+
+    uuids = [p.uuid for p in photos]
+    assert uuids == ALBUM_SORT_ORDER

 def test_attributes():
    import datetime
@@ -236,6 +257,46 @@ def test_attributes():
    assert p.ismissing == False


+def test_attributes_2():
+    """ Test attributes including height, width, etc """
+    import datetime
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.keywords == ["wedding"]
+    assert p.original_filename == "wedding.jpg"
+    assert p.filename == "E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.jpeg"
+    assert p.date == datetime.datetime(
+        2019,
+        4,
+        15,
+        14,
+        40,
+        24,
+        86000,
+        datetime.timezone(datetime.timedelta(seconds=-14400)),
+    )
+    assert p.description == "Bride Wedding day"
+    assert p.title is None
+    assert sorted(p.albums) == ["AlbumInFolder", "I have a deleted twin"]
+    assert p.persons == ["Maria"]
+    assert p.path.endswith(
+        "tests/Test-10.15.5.photoslibrary/originals/E/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.jpeg"
+    )
+    assert not p.ismissing
+    assert p.hasadjustments
+    assert p.height == 1325
+    assert p.width == 1526
+    assert p.original_height == 1367
+    assert p.original_width == 2048
+    assert p.orientation == 1
+    assert p.original_orientation == 1
+    assert p.original_filesize == 460483
+
+
 def test_missing():
    import osxphotos

@@ -392,7 +453,96 @@ def test_count():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos()
-    assert len(photos) == PHOTOS_DB_LEN
+    assert len(photos) == PHOTOS_NOT_IN_TRASH_LEN
+
+
+def test_photos_intrash_1():
+    """ test PhotosDB.photos(intrash=True) """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(intrash=True)
+    assert len(photos) == PHOTOS_IN_TRASH_LEN
+
+
+def test_photos_intrash_2():
+    """ test PhotosDB.photos(intrash=True) """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(intrash=True)
+    for p in photos:
+        assert p.intrash
+
+
+def test_photos_intrash_3():
+    """ test PhotosDB.photos(intrash=False) """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(intrash=False)
+    for p in photos:
+        assert not p.intrash
+
+
+def test_photoinfo_intrash_1():
+    """ Test PhotoInfo.intrash """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(uuid=[UUID_DICT["intrash"]], intrash=True)[0]
+    assert p.intrash
+
+
+def test_photoinfo_intrash_2():
+    """ Test PhotoInfo.intrash and intrash=default"""
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(uuid=[UUID_DICT["intrash"]])
+    assert not p
+
+
+def test_photoinfo_intrash_3():
+    """ Test PhotoInfo.intrash and photo has keyword and person """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(uuid=[UUID_DICT["intrash_person_keywords"]], intrash=True)[0]
+    assert p.intrash
+    assert "Maria" in p.persons
+    assert "wedding" in p.keywords
+
+
+def test_photoinfo_intrash_4():
+    """ Test PhotoInfo.intrash and photo has keyword and person """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(persons=["Maria"], intrash=True)[0]
+    assert p.intrash
+    assert "Maria" in p.persons
+    assert "wedding" in p.keywords
+
+
+def test_photoinfo_intrash_5():
+    """ Test PhotoInfo.intrash and photo has keyword and person """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(keywords=["wedding"], intrash=True)[0]
+    assert p.intrash
+    assert "Maria" in p.persons
+    assert "wedding" in p.keywords
+
+
+def test_photoinfo_not_intrash():
+    """ Test PhotoInfo.intrash """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(uuid=[UUID_DICT["not_intrash"]])[0]
+    assert not p.intrash


 def test_keyword_2():
@@ -400,7 +550,7 @@ def test_keyword_2():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(keywords=["wedding"])
-    assert len(photos) == 2
+    assert len(photos) == 2  # won't show the one in the trash


 def test_keyword_not_in_album():
@@ -425,7 +575,14 @@ def test_album_folder_name():
    photos = photosdb.photos(albums=["Pumpkin Farm"])
    assert sorted(p.uuid for p in photos) == sorted(UUID_PUMPKIN_FARM)

+def test_multi_person():
+    import osxphotos

+    photosdb = osxphotos.PhotosDB(PHOTOS_DB)
+    photos = photosdb.photos(persons=["Katie", "Suzy"])
+
+    assert len(photos) == 3
+    
 def test_get_db_path():
    import osxphotos

@@ -868,12 +1025,39 @@ def test_from_to_date():
    photosdb = osxphotos.PhotosDB(PHOTOS_DB)

    photos = photosdb.photos(from_date=dt.datetime(2018, 10, 28))
-    assert len(photos) == 7
+    assert len(photos) == 6

    photos = photosdb.photos(to_date=dt.datetime(2018, 10, 28))
-    assert len(photos) == 6
+    assert len(photos) == 7

    photos = photosdb.photos(
        from_date=dt.datetime(2018, 9, 28), to_date=dt.datetime(2018, 9, 29)
    )
    assert len(photos) == 4
+
+
+def test_date_invalid():
+    """ Test date is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    delta = timedelta(seconds=p.tzoffset)
+    tz = timezone(delta)
+    assert p.date == datetime(1970, 1, 1).astimezone(tz=tz)
+
+
+def test_date_modified_invalid():
+    """ Test date modified is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.date_modified is None
+
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -197,6 +197,23 @@ CLI_EXPORT_RAW_EDITED = [
 ]
 CLI_EXPORT_RAW_EDITED_ORIGINAL = ["IMG_0476_2.CR2", "IMG_0476_2_edited.jpeg"]

+CLI_UUID_DICT_15_5 = {
+    "intrash": "71E3E212-00EB-430D-8A63-5E294B268554",
+    "template": "F12384F6-CD17-4151-ACBA-AE0E3688539E",
+}
+
+CLI_TEMPLATE_SIDECAR_FILENAME = "Pumkins1.json"
+
+CLI_UUID_DICT_14_6 = {"intrash": "3tljdX43R8+k6peNHVrJNQ"}
+
+PHOTOS_NOT_IN_TRASH_LEN_14_6 = 7
+PHOTOS_IN_TRASH_LEN_14_6 = 1
+PHOTOS_MISSING_14_6 = 1
+
+PHOTOS_NOT_IN_TRASH_LEN_15_5 = 13
+PHOTOS_IN_TRASH_LEN_15_5 = 2
+PHOTOS_MISSING_15_5 = 2
+
 CLI_PLACES_JSON = """{"places": {"_UNKNOWN_": 1, "Maui, Wailea, Hawai'i, United States": 1, "Washington, District of Columbia, United States": 1}}"""

 CLI_EXIFTOOL = {
@@ -243,7 +260,7 @@ LABELS_JSON = {
 KEYWORDS_JSON = {
    "keywords": {
        "Kids": 4,
-        "wedding": 2,
+        "wedding": 3,
        "London 2018": 1,
        "St. James's Park": 1,
        "England": 1,
@@ -266,7 +283,7 @@ ALBUMS_JSON = {
    "shared albums": {},
 }

-PERSONS_JSON = {"persons": {"Katie": 3, "Suzy": 2, "_UNKNOWN_": 1, "Maria": 1}}
+PERSONS_JSON = {"persons": {"Katie": 3, "Suzy": 2, "_UNKNOWN_": 1, "Maria": 2}}

 # determine if exiftool installed so exiftool tests can be skipped
 try:
@@ -957,6 +974,103 @@ def test_query_label_4():
    assert len(json_got) == 6


+def test_query_deleted_deleted_only():
+    """Test query with --deleted and --deleted-only"""
+    import json
+    import osxphotos
+    import os
+    import os.path
+    from osxphotos.__main__ import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query,
+        [
+            "--json",
+            "--db",
+            os.path.join(cwd, PHOTOS_DB_15_5),
+            "--deleted",
+            "--deleted-only",
+        ],
+    )
+    assert "Incompatible query options" in result.output
+
+
+def test_query_deleted_1():
+    """Test query with --deleted"""
+    import json
+    import osxphotos
+    import os
+    import os.path
+    from osxphotos.__main__ import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_15_5), "--deleted"]
+    )
+    assert result.exit_code == 0
+    json_got = json.loads(result.output)
+    assert len(json_got) == PHOTOS_NOT_IN_TRASH_LEN_15_5 + PHOTOS_IN_TRASH_LEN_15_5
+
+
+def test_query_deleted_2():
+    """Test query with --deleted"""
+    import json
+    import osxphotos
+    import os
+    import os.path
+    from osxphotos.__main__ import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_14_6), "--deleted"]
+    )
+    assert result.exit_code == 0
+    json_got = json.loads(result.output)
+    assert len(json_got) == PHOTOS_NOT_IN_TRASH_LEN_14_6 + PHOTOS_IN_TRASH_LEN_14_6
+
+
+def test_query_deleted_3():
+    """Test query with --deleted-only"""
+    import json
+    import osxphotos
+    import os
+    import os.path
+    from osxphotos.__main__ import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_15_5), "--deleted-only"]
+    )
+    assert result.exit_code == 0
+    json_got = json.loads(result.output)
+    assert len(json_got) == PHOTOS_IN_TRASH_LEN_15_5
+    assert json_got[0]["intrash"]
+
+
+def test_query_deleted_4():
+    """Test query with --deleted-only"""
+    import json
+    import osxphotos
+    import os
+    import os.path
+    from osxphotos.__main__ import query
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    result = runner.invoke(
+        query, ["--json", "--db", os.path.join(cwd, PHOTOS_DB_14_6), "--deleted-only"]
+    )
+    assert result.exit_code == 0
+    json_got = json.loads(result.output)
+    assert len(json_got) == PHOTOS_IN_TRASH_LEN_14_6
+    assert json_got[0]["intrash"]
+
+
 def test_export_sidecar():
    import glob
    import os
@@ -987,6 +1101,48 @@ def test_export_sidecar():
        assert sorted(files) == sorted(CLI_EXPORT_SIDECAR_FILENAMES)


+def test_export_sidecar_templates():
+    import json
+    import os
+    import os.path
+    import osxphotos
+
+    from osxphotos.__main__ import cli
+
+    runner = CliRunner()
+    cwd = os.getcwd()
+    # pylint: disable=not-context-manager
+    with runner.isolated_filesystem():
+        result = runner.invoke(
+            cli,
+            [
+                "export",
+                "--db",
+                os.path.join(cwd, PHOTOS_DB_15_5),
+                ".",
+                "--sidecar=json",
+                f"--uuid={CLI_UUID_DICT_15_5['template']}",
+                "-V",
+                "--keyword-template",
+                "{person}",
+                "--description-template",
+                "{descr} {person} {keyword} {album}",
+            ],
+        )
+        assert result.exit_code == 0
+        assert os.path.isfile(CLI_TEMPLATE_SIDECAR_FILENAME)
+        with open(CLI_TEMPLATE_SIDECAR_FILENAME, "r") as jsonfile:
+            exifdata = json.load(jsonfile)
+        assert (
+            exifdata[0]["XMP:Description"][0]
+            == "Girls with pumpkins Katie, Suzy Kids Pumpkin Farm, Test Album"
+        )
+        assert (
+            exifdata[0]["EXIF:ImageDescription"][0]
+            == "Girls with pumpkins Katie, Suzy Kids Pumpkin Farm, Test Album"
+        )
+
+
 def test_export_live():
    import glob
    import os
@@ -1434,6 +1590,138 @@ def test_export_album_deleted_twin():
        assert sorted(files) == sorted(CLI_EXPORT_FILENAMES_DELETED_TWIN)


+def test_export_deleted_1():
+    """Test export with --deleted """
+    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():
+        skip = ["--skip-edited", "--skip-bursts", "--skip-live", "--skip-raw"]
+        result = runner.invoke(
+            export, [os.path.join(cwd, PHOTOS_DB_15_5), ".", "--deleted", *skip]
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert (
+            len(files)
+            == PHOTOS_NOT_IN_TRASH_LEN_15_5
+            + PHOTOS_IN_TRASH_LEN_15_5
+            - PHOTOS_MISSING_15_5
+        )
+
+
+def test_export_deleted_2():
+    """Test export with --deleted """
+    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():
+        skip = ["--skip-edited", "--skip-bursts", "--skip-live", "--skip-raw"]
+        result = runner.invoke(
+            export, [os.path.join(cwd, PHOTOS_DB_14_6), ".", "--deleted", *skip]
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert (
+            len(files)
+            == PHOTOS_NOT_IN_TRASH_LEN_14_6
+            + PHOTOS_IN_TRASH_LEN_14_6
+            - PHOTOS_MISSING_14_6
+        )
+
+
+def test_export_not_deleted_1():
+    """Test export does not find intrash files without --deleted 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():
+        skip = ["--skip-edited", "--skip-bursts", "--skip-live", "--skip-raw"]
+        result = runner.invoke(export, [os.path.join(cwd, PHOTOS_DB_15_5), ".", *skip])
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert len(files) == PHOTOS_NOT_IN_TRASH_LEN_15_5 - PHOTOS_MISSING_15_5
+
+
+def test_export_not_deleted_2():
+    """Test export does not find intrash files without --deleted 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():
+        skip = ["--skip-edited", "--skip-bursts", "--skip-live", "--skip-raw"]
+        result = runner.invoke(export, [os.path.join(cwd, PHOTOS_DB_14_6), ".", *skip])
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert len(files) == PHOTOS_NOT_IN_TRASH_LEN_14_6 - PHOTOS_MISSING_14_6
+
+
+def test_export_deleted_only_1():
+    """Test export with --deleted-only """
+    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():
+        skip = ["--skip-edited", "--skip-bursts", "--skip-live", "--skip-raw"]
+        result = runner.invoke(
+            export, [os.path.join(cwd, PHOTOS_DB_15_5), ".", "--deleted-only", *skip]
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert len(files) == PHOTOS_IN_TRASH_LEN_15_5
+
+
+def test_export_deleted_only_2():
+    """Test export with --deleted-only """
+    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():
+        skip = ["--skip-edited", "--skip-bursts", "--skip-live", "--skip-raw"]
+        result = runner.invoke(
+            export, [os.path.join(cwd, PHOTOS_DB_14_6), ".", "--deleted-only", *skip]
+        )
+        assert result.exit_code == 0
+        files = glob.glob("*")
+        assert len(files) == PHOTOS_IN_TRASH_LEN_14_6
+
+
 def test_places():
    import json
    import os
--- a/tests/test_export_catalina_10_15_1.py
+++ b/tests/test_export_catalina_10_15_1.py
@@ -455,7 +455,6 @@ def test_exiftool_json_sidecar():
    "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",
@@ -586,7 +585,7 @@ def test_xmp_sidecar():
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
        <Iptc4xmpExt:PersonInImage>
            <rdf:Bag>
@@ -595,7 +594,7 @@ def test_xmp_sidecar():
            </rdf:Bag>
        </Iptc4xmpExt:PersonInImage>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
        <digiKam:TagsList>
            <rdf:Seq>
@@ -603,10 +602,13 @@ def test_xmp_sidecar():
            </rdf:Seq>
        </digiKam:TagsList>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
        <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
        <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
+        </rdf:Description>
+         <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
        </rdf:Description>
        </rdf:RDF>
    </x:xmpmeta>"""
@@ -647,7 +649,7 @@ def test_xmp_sidecar_use_persons_keyword():
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
        <Iptc4xmpExt:PersonInImage>
            <rdf:Bag>
@@ -656,7 +658,7 @@ def test_xmp_sidecar_use_persons_keyword():
            </rdf:Bag>
        </Iptc4xmpExt:PersonInImage>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
        <digiKam:TagsList>
            <rdf:Seq>
@@ -666,11 +668,14 @@ def test_xmp_sidecar_use_persons_keyword():
            </rdf:Seq>
        </digiKam:TagsList>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
        <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
        <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
        </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
        </rdf:RDF>
    </x:xmpmeta>"""

@@ -710,7 +715,7 @@ def test_xmp_sidecar_use_albums_keyword():
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
        <Iptc4xmpExt:PersonInImage>
            <rdf:Bag>
@@ -719,7 +724,7 @@ def test_xmp_sidecar_use_albums_keyword():
            </rdf:Bag>
        </Iptc4xmpExt:PersonInImage>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
        <digiKam:TagsList>
            <rdf:Seq>
@@ -729,11 +734,14 @@ def test_xmp_sidecar_use_albums_keyword():
            </rdf:Seq>
        </digiKam:TagsList>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
        <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
        <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
        </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
        </rdf:RDF>
    </x:xmpmeta>"""

@@ -746,3 +754,75 @@ def test_xmp_sidecar_use_albums_keyword():
        sorted(xmp_expected_lines), sorted(xmp_got_lines)
    ):
        assert line_expected == line_got
+
+
+def test_xmp_sidecar_gps():
+    """ Test export XMP sidecar with GPS info """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["location"]])
+
+    xmp_expected = """<!-- Created with osxphotos https://github.com/RhetTbull/osxphotos -->
+<x:xmpmeta xmlns:x="adobe:ns:meta/" x:xmptk="XMP Core 5.4.0">
+    <!-- mirrors Photos 5 "Export IPTC as XMP" option -->
+    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+        <rdf:Description rdf:about="" 
+            xmlns:dc="http://purl.org/dc/elements/1.1/" 
+            xmlns:photoshop="http://ns.adobe.com/photoshop/1.0/">
+        <dc:description></dc:description>
+        <dc:title>St. James's Park</dc:title>
+        <!-- keywords and persons listed in <dc:subject> as Photos does -->
+        <dc:subject>
+            <rdf:Seq>
+                <rdf:li>UK</rdf:li>
+                <rdf:li>England</rdf:li>
+                <rdf:li>London</rdf:li>
+                <rdf:li>United Kingdom</rdf:li>
+                <rdf:li>London 2018</rdf:li>
+                <rdf:li>St. James's Park</rdf:li>
+            </rdf:Seq>
+        </dc:subject>
+        <photoshop:DateCreated>2018-10-13T09:18:12.501000-04:00</photoshop:DateCreated>
+        </rdf:Description>
+        <rdf:Description rdf:about=""  
+            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
+        </rdf:Description>
+        <rdf:Description rdf:about="" 
+            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
+        <digiKam:TagsList>
+            <rdf:Seq>
+                <rdf:li>UK</rdf:li>
+                <rdf:li>England</rdf:li>
+                <rdf:li>London</rdf:li>
+                <rdf:li>United Kingdom</rdf:li>
+                <rdf:li>London 2018</rdf:li>
+                <rdf:li>St. James's Park</rdf:li>
+            </rdf:Seq>
+        </digiKam:TagsList>
+        </rdf:Description>
+        <rdf:Description rdf:about="" 
+            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
+        <xmp:CreateDate>2018-10-13T09:18:12</xmp:CreateDate>
+        <xmp:ModifyDate>2018-10-13T09:18:12</xmp:ModifyDate>
+        </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        <exif:GPSLongitudeRef>W</exif:GPSLongitudeRef>
+        <exif:GPSLongitude>0.1318055</exif:GPSLongitude>
+        <exif:GPSLatitude>51.50357167</exif:GPSLatitude>
+        <exif:GPSLatitudeRef>N</exif:GPSLatitudeRef>
+        </rdf:Description>
+   </rdf:RDF>
+</x:xmpmeta>"""
+
+    xmp_expected_lines = [line.strip() for line in xmp_expected.split("\n")]
+
+    xmp_got = photos[0]._xmp_sidecar()
+    xmp_got_lines = [line.strip() for line in xmp_got.split("\n")]
+
+    for line_expected, line_got in zip(
+        sorted(xmp_expected_lines), sorted(xmp_got_lines)
+    ):
+        assert line_expected == line_got
+
--- a/tests/test_export_keyword_template_catalina_10_15_4.py
+++ b/tests/test_export_keyword_template_catalina_10_15_4.py
@@ -178,7 +178,7 @@ def test_xmp_sidecar_keyword_template():
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
        <Iptc4xmpExt:PersonInImage>
            <rdf:Bag>
@@ -187,7 +187,7 @@ def test_xmp_sidecar_keyword_template():
            </rdf:Bag>
        </Iptc4xmpExt:PersonInImage>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
        <digiKam:TagsList>
            <rdf:Seq>
@@ -198,11 +198,14 @@ def test_xmp_sidecar_keyword_template():
            </rdf:Seq>
        </digiKam:TagsList>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about=""
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
        <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
        <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
        </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
    </rdf:RDF>
    </x:xmpmeta>"""

--- a/tests/test_export_mojave_10_14_6.py
+++ b/tests/test_export_mojave_10_14_6.py
@@ -380,7 +380,6 @@ def test_exiftool_json_sidecar():
    "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",
@@ -431,7 +430,7 @@ def test_xmp_sidecar():
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
        <Iptc4xmpExt:PersonInImage>
            <rdf:Bag>
@@ -440,7 +439,7 @@ def test_xmp_sidecar():
            </rdf:Bag>
        </Iptc4xmpExt:PersonInImage>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
        <digiKam:TagsList>
            <rdf:Seq>
@@ -448,11 +447,14 @@ def test_xmp_sidecar():
            </rdf:Seq>
        </digiKam:TagsList>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
        <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
        <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
        </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
        </rdf:RDF>
        </x:xmpmeta>"""

@@ -490,7 +492,7 @@ def test_xmp_sidecar_keyword_template():
        </dc:subject>
        <photoshop:DateCreated>2018-09-28T15:35:49.063000-04:00</photoshop:DateCreated>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:Iptc4xmpExt='http://iptc.org/std/Iptc4xmpExt/2008-02-29/'>
        <Iptc4xmpExt:PersonInImage>
            <rdf:Bag>
@@ -499,7 +501,7 @@ def test_xmp_sidecar_keyword_template():
            </rdf:Bag>
        </Iptc4xmpExt:PersonInImage>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:digiKam='http://www.digikam.org/ns/1.0/'>
        <digiKam:TagsList>
            <rdf:Seq>
@@ -510,11 +512,14 @@ def test_xmp_sidecar_keyword_template():
            </rdf:Seq>
        </digiKam:TagsList>
        </rdf:Description>
-        <rdf:Description rdf:about='' 
+        <rdf:Description rdf:about="" 
            xmlns:xmp='http://ns.adobe.com/xap/1.0/'>
        <xmp:CreateDate>2018-09-28T15:35:49</xmp:CreateDate>
        <xmp:ModifyDate>2018-09-28T15:35:49</xmp:ModifyDate>
        </rdf:Description>
+        <rdf:Description rdf:about=""
+            xmlns:exif='http://ns.adobe.com/exif/1.0/'>
+        </rdf:Description>
    </rdf:RDF>
    </x:xmpmeta>"""

--- a/tests/test_highsierra.py
+++ b/tests/test_highsierra.py
@@ -1,6 +1,6 @@
 import pytest

-# TODO: put some of this code into a pre-function
+from osxphotos._constants import _UNKNOWN_PERSON

 PHOTOS_DB = "./tests/Test-10.13.6.photoslibrary/database/photos.db"
 KEYWORDS = [
@@ -14,7 +14,7 @@ KEYWORDS = [
    "UK",
    "United Kingdom",
 ]
-PERSONS = ["Katie", "Suzy", "Maria"]
+PERSONS = ["Katie", "Suzy", "Maria", _UNKNOWN_PERSON]
 ALBUMS = ["Pumpkin Farm", "AlbumInFolder", "TestAlbum"]
 KEYWORDS_DICT = {
    "Kids": 4,
@@ -27,7 +27,7 @@ KEYWORDS_DICT = {
    "UK": 1,
    "United Kingdom": 1,
 }
-PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1}
+PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, _UNKNOWN_PERSON: 1}
 ALBUM_DICT = {"Pumpkin Farm": 3, "TestAlbum": 1, "AlbumInFolder": 1}


--- a/tests/test_mojave_10_14_5.py
+++ b/tests/test_mojave_10_14_5.py
@@ -1,6 +1,7 @@
 import pytest

-# TODO: put some of this code into a pre-function
+
+from osxphotos._constants import _UNKNOWN_PERSON

 PHOTOS_DB = "./tests/Test-10.14.5.photoslibrary/database/photos.db"
 KEYWORDS = [
@@ -14,7 +15,7 @@ KEYWORDS = [
    "UK",
    "United Kingdom",
 ]
-PERSONS = ["Katie", "Suzy", "Maria"]
+PERSONS = ["Katie", "Suzy", "Maria", _UNKNOWN_PERSON]
 ALBUMS = ["Pumpkin Farm"]
 KEYWORDS_DICT = {
    "Kids": 4,
@@ -27,7 +28,7 @@ KEYWORDS_DICT = {
    "UK": 1,
    "United Kingdom": 1,
 }
-PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1}
+PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, _UNKNOWN_PERSON: 1}
 ALBUM_DICT = {"Pumpkin Farm": 3}


--- a/tests/test_mojave_10_14_6.py
+++ b/tests/test_mojave_10_14_6.py
@@ -1,6 +1,6 @@
 import pytest

-# TODO: put some of this code into a pre-function
+from osxphotos._constants import _UNKNOWN_PERSON

 PHOTOS_DB = "./tests/Test-10.14.6.photoslibrary/database/photos.db"
 PHOTOS_DB_PATH = "/Test-10.14.6.photoslibrary/database/photos.db"
@@ -17,7 +17,7 @@ KEYWORDS = [
    "UK",
    "United Kingdom",
 ]
-PERSONS = ["Katie", "Suzy", "Maria"]
+PERSONS = ["Katie", "Suzy", "Maria", _UNKNOWN_PERSON]
 ALBUMS = ["Pumpkin Farm", "AlbumInFolder", "Test Album", "Test Album (1)"]
 KEYWORDS_DICT = {
    "Kids": 4,
@@ -30,7 +30,7 @@ KEYWORDS_DICT = {
    "UK": 1,
    "United Kingdom": 1,
 }
-PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1}
+PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, _UNKNOWN_PERSON: 1}
 ALBUM_DICT = {
    "Pumpkin Farm": 3,
    "AlbumInFolder": 1,
@@ -41,8 +41,23 @@ ALBUM_DICT = {
 UUID_DICT = {
    "favorite": "6bxcNnzRQKGnK4uPrCJ9UQ",
    "not_favorite": "8SOE9s0XQVGsuq4ONohTng",
+    "date_invalid": "YZFCPY24TUySvpu7owiqxA",
+    "intrash": "3tljdX43R8+k6peNHVrJNQ",
+    "not_intrash": "6bxcNnzRQKGnK4uPrCJ9UQ",
+    "has_adjustments": "6bxcNnzRQKGnK4uPrCJ9UQ",
 }

+ALBUM_SORT_ORDER = [
+    "HrK3ZQdlQ7qpDA0FgOYXLA",
+    "8SOE9s0XQVGsuq4ONohTng",
+    "15uNd7%8RguTEgNPKHfTWw",
+]
+ALBUM_KEY_PHOTO = "15uNd7%8RguTEgNPKHfTWw"
+
+PHOTOS_DB_LEN = 8
+PHOTOS_NOT_IN_TRASH_LEN = 7
+PHOTOS_IN_TRASH_LEN = 1
+

 def test_init():
    import osxphotos
@@ -58,12 +73,13 @@ def test_db_version():
    assert photosdb.db_version in osxphotos._constants._TESTED_DB_VERSIONS
    assert photosdb.db_version == "4025"

+
 def test_db_len():
    import osxphotos

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    # assert photosdb.db_version in osxphotos._TESTED_DB_VERSIONS
-    assert len(photosdb) == 7
+    assert len(photosdb) == PHOTOS_DB_LEN


 def test_os_version():
@@ -127,6 +143,17 @@ def test_albums_as_dict():
    assert albums == ALBUM_DICT


+def test_album_sort_order():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    album = [a for a in photosdb.album_info if a.title == "Pumpkin Farm"][0]
+    photos = album.photos
+
+    uuids = [p.uuid for p in photos]
+    assert uuids == ALBUM_SORT_ORDER
+
+
 def test_attributes():
    import datetime
    import osxphotos
@@ -153,6 +180,44 @@ def test_attributes():
    assert p.ismissing == False


+def test_attributes_2():
+    """ Test attributes including height, width, etc """
+    import datetime
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["has_adjustments"]])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.keywords == ["wedding"]
+    assert p.original_filename == "wedding.jpg"
+    assert p.filename == "wedding.jpg"
+    assert p.date == datetime.datetime(
+        2019,
+        4,
+        15,
+        14,
+        40,
+        24,
+        86000,
+        datetime.timezone(datetime.timedelta(seconds=-14400)),
+    )
+    assert p.description == "Bride Wedding day"
+    assert p.title is None
+    assert sorted(p.albums) == []
+    assert p.persons == ["Maria"]
+    assert p.path.endswith("Masters/2019/07/27/20190727-131650/wedding.jpg")
+    assert not p.ismissing
+    assert p.hasadjustments
+    assert p.height == 1325
+    assert p.width == 1526
+    assert p.original_height == 1367
+    assert p.original_width == 2048
+    assert p.orientation == 1
+    assert p.original_orientation == 1
+    assert p.original_filesize == 460483
+
+
 def test_missing():
    import osxphotos

@@ -160,8 +225,8 @@ def test_missing():
    photos = photosdb.photos(uuid=["od0fmC7NQx+ayVr+%i06XA"])
    assert len(photos) == 1
    p = photos[0]
-    assert p.path == None
-    assert p.ismissing == True
+    assert p.path is None
+    assert p.ismissing


 def test_favorite():
@@ -307,7 +372,63 @@ def test_count():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos()
-    assert len(photos) == 7
+    assert len(photos) == PHOTOS_NOT_IN_TRASH_LEN
+
+
+def test_photos_intrash_1():
+    """ test PhotosDB.photos(intrash=True) """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(intrash=True)
+    assert len(photos) == PHOTOS_IN_TRASH_LEN
+
+
+def test_photos_intrash_2():
+    """ test PhotosDB.photos(intrash=True) """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(intrash=True)
+    for p in photos:
+        assert p.intrash
+
+
+def test_photos_intrash_2():
+    """ test PhotosDB.photos(intrash=False) """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(intrash=False)
+    for p in photos:
+        assert not p.intrash
+
+
+def test_photoinfo_intrash_1():
+    """ Test PhotoInfo.intrash """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(uuid=[UUID_DICT["intrash"]], intrash=True)[0]
+    assert p.intrash
+
+
+def test_photoinfo_intrash_2():
+    """ Test PhotoInfo.intrash and intrash=default"""
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(uuid=[UUID_DICT["intrash"]])
+    assert not p
+
+
+def test_photoinfo_not_intrash():
+    """ Test PhotoInfo.intrash """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    p = photosdb.photos(uuid=[UUID_DICT["not_intrash"]])[0]
+    assert not p.intrash


 def test_keyword_2():
@@ -407,3 +528,30 @@ def test_multi_person():
    photos = photosdb.photos(persons=["Katie", "Suzy"])

    assert len(photos) == 3
+
+
+def test_date_invalid():
+    """ Test date is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    delta = timedelta(seconds=p.tzoffset)
+    tz = timezone(delta)
+    assert p.date == datetime(1970, 1, 1).astimezone(tz=tz)
+
+
+def test_date_modified_invalid():
+    """ Test date modified is invalid """
+    from datetime import datetime, timedelta, timezone
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=[UUID_DICT["date_invalid"]])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.date_modified is None
+
--- a/tests/test_movies_4_0.py
+++ b/tests/test_movies_4_0.py
@@ -13,6 +13,9 @@ ALBUM_DICT = {}

 UUID_DICT = {"movie": "CfnR005YQ1uvNdq8UcnFtw", "image": "XuKdBnARTB+fPyyY+uh4fQ"}

+PHOTOS_LEN = 6
+MOVIES_LEN = 1
+

 def test_init():
    import osxphotos
@@ -97,8 +100,8 @@ def test_count_photos():
    import osxphotos

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos()
-    assert len(photos) == 6
+    photos = photosdb.photos(movies=False)
+    assert len(photos) == PHOTOS_LEN


 def test_count_movies():
@@ -106,7 +109,7 @@ def test_count_movies():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(movies=True, images=False)
-    assert len(photos) == 1
+    assert len(photos) == MOVIES_LEN


 def test_count_movies_2():
@@ -114,7 +117,7 @@ def test_count_movies_2():

    # if don't ask for movies=True, won't get any
    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=[UUID_DICT["movie"]])
+    photos = photosdb.photos(uuid=[UUID_DICT["movie"]], movies=False)
    assert len(photos) == 0


@@ -123,7 +126,7 @@ def test_count_all():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(images=True, movies=True)
-    assert len(photos) == 7
+    assert len(photos) == PHOTOS_LEN + MOVIES_LEN


 def test_uti_movie():
--- a/tests/test_movies_5_0.py
+++ b/tests/test_movies_5_0.py
@@ -16,6 +16,9 @@ UUID_DICT = {
    "image": "FF158787-3EA0-4B06-8D93-4E7E362495DE",
 }

+PHOTOS_LEN = 6
+MOVIES_LEN = 1
+

 def test_init():
    import osxphotos
@@ -102,8 +105,8 @@ def test_count_photos():
    import osxphotos

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos()
-    assert len(photos) == 6
+    photos = photosdb.photos(movies=False)
+    assert len(photos) == PHOTOS_LEN


 def test_count_movies():
@@ -111,7 +114,7 @@ def test_count_movies():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(movies=True, images=False)
-    assert len(photos) == 1
+    assert len(photos) == MOVIES_LEN


 def test_count_movies_2():
@@ -119,7 +122,7 @@ def test_count_movies_2():

    # if don't ask for movies=True, won't get any
    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
-    photos = photosdb.photos(uuid=[UUID_DICT["movie"]])
+    photos = photosdb.photos(uuid=[UUID_DICT["movie"]], movies=False)
    assert len(photos) == 0


@@ -128,7 +131,7 @@ def test_count_all():

    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
    photos = photosdb.photos(images=True, movies=True)
-    assert len(photos) == 7
+    assert len(photos) == PHOTOS_LEN + MOVIES_LEN


 def test_uti_movie():
--- a/tests/test_template.py
+++ b/tests/test_template.py
@@ -458,3 +458,48 @@ def test_subst_strftime():

    rendered, unmatched = photo.render_template("{created.strftime}")
    assert rendered[0] == "_"
+
+
+def test_subst_expand_inplace_1():
+    """ Test that substitutions are correct when expand_inplace=True """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB_15_1)
+    # one album, one keyword, two persons
+    photo = photosdb.photos(uuid=[UUID_DICT["1_1_2"]])[0]
+
+    template = "{person}"
+    expected = ["Katie,Suzy"]
+    rendered, unknown = photo.render_template(template, expand_inplace=True)
+    assert sorted(rendered) == sorted(expected)
+
+
+def test_subst_expand_inplace_2():
+    """ Test that substitutions are correct when expand_inplace=True """
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB_15_1)
+    # one album, one keyword, two persons
+    photo = photosdb.photos(uuid=[UUID_DICT["1_1_2"]])[0]
+
+    template = "{person}-{keyword}"
+    expected = ["Katie,Suzy-Kids"]
+    rendered, unknown = photo.render_template(template, expand_inplace=True)
+    assert sorted(rendered) == sorted(expected)
+
+
+def test_subst_expand_inplace_3():
+    """ Test that substitutions are correct when expand_inplace=True and inplace_sep specified"""
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB_15_1)
+    # one album, one keyword, two persons
+    photo = photosdb.photos(uuid=[UUID_DICT["1_1_2"]])[0]
+
+    template = "{person}-{keyword}"
+    expected = ["Katie; Suzy-Kids"]
+    rendered, unknown = photo.render_template(
+        template, expand_inplace=True, inplace_sep="; "
+    )
+    assert sorted(rendered) == sorted(expected)
+
--- a/tests/test_template_today.py
+++ b/tests/test_template_today.py
@@ -0,0 +1,70 @@
+import datetime
+
+import pytest
+
+PHOTOS_DB_PLACES = (
+    "./tests/Test-Places-Catalina-10_15_1.photoslibrary/database/photos.db"
+)
+
+DATETIME_TODAY = datetime.datetime(2020, 6, 21, 13, 0, 0)
+""" Used to patch osxphotos.phototemplate.TODAY for testing """
+
+UUID_DICT = {
+    "place_dc": "128FB4C6-0B16-4E7D-9108-FB2E90DA1546",
+    "1_1_2": "1EB2B765-0765-43BA-A90C-0D0580E6172C",
+    "2_1_1": "D79B8D77-BFFC-460B-9312-034F2877D35B",
+    "0_2_0": "6191423D-8DB8-4D4C-92BE-9BBBA308AAC4",
+    "folder_album_1": "3DD2C897-F19E-4CA6-8C22-B027D5A71907",
+    "folder_album_no_folder": "D79B8D77-BFFC-460B-9312-034F2877D35B",
+    "mojave_album_1": "15uNd7%8RguTEgNPKHfTWw",
+}
+
+TODAY_VALUES = {
+    "{today.date}": "2020-06-21",
+    "{today.year}": "2020",
+    "{today.yy}": "20",
+    "{today.mm}": "06",
+    "{today.month}": "June",
+    "{today.mon}": "Jun",
+    "{today.dd}": "21",
+    "{today.dow}": "Sunday",
+    "{today.doy}": "173",
+    "{today.hour}": "13",
+    "{today.min}": "00",
+    "{today.sec}": "00",
+}
+
+
+def test_subst_today():
+    """ Test that substitutions are correct for {today.x}"""
+    import locale
+    import osxphotos
+
+    locale.setlocale(locale.LC_ALL, "en_US")
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB_PLACES)
+    photo = photosdb.photos(uuid=[UUID_DICT["place_dc"]])[0]
+
+    photo_template = osxphotos.PhotoTemplate(photo)
+    photo_template.today = DATETIME_TODAY
+
+    for template in TODAY_VALUES:
+        rendered, _ = photo_template.render(template)
+        assert rendered[0] == TODAY_VALUES[template]
+
+
+def test_subst_strftime_today():
+    """ Test that strftime substitutions are correct for {today.strftime}"""
+    import locale
+    import osxphotos
+
+    locale.setlocale(locale.LC_ALL, "en_US")
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB_PLACES)
+    photo = photosdb.photos(uuid=[UUID_DICT["place_dc"]])[0]
+
+    photo_template = osxphotos.PhotoTemplate(photo)
+    photo_template.today = DATETIME_TODAY
+    rendered, unmatched = photo_template.render("{today.strftime,%Y-%m-%d-%H%M%S}")
+    assert rendered[0] == "2020-06-21-130000"
+
+    rendered, unmatched = photo.render_template("{today.strftime}")
+    assert rendered[0] == "_"
Author	SHA1	Message	Date
Rhet Turnbull	9d820a0557	AlbumInfo.photos now returns photos in album sort order	2020-07-06 10:06:11 -07:00
Rhet Turnbull	fcff8ec5f8	Refactored person processing to enable implementation of #181	2020-07-06 00:10:22 -07:00
Rhet Turnbull	dfcbfa725a	Updated CHANGELOG.md	2020-07-04 10:17:25 -07:00
Rhet Turnbull	df75a05645	Bug fix for keywords, persons in deleted photos	2020-07-04 09:54:43 -07:00
Rhet Turnbull	80f5989e2c	Updated CHANGELOG.md	2020-07-03 12:31:18 -07:00
Rhet Turnbull	8c3af0a4e4	Added height, width, orientation, filesize to json, str)	2020-07-03 12:28:26 -07:00
Rhet Turnbull	4523224276	Updated CHANGELOG.md	2020-07-03 12:04:20 -07:00
Rhet Turnbull	541c390b7b	Added height, width, orientation, filesize, closes #163	2020-07-03 11:24:59 -07:00
Rhet Turnbull	6ab0ad7e86	Added GPS location to XMP sidecar, closes #175	2020-07-03 09:04:23 -07:00
Rhet Turnbull	e5755c6144	Updated CHANGELOG.md	2020-06-28 21:54:36 -07:00
Rhet Turnbull	7806e05673	Updated README.md	2020-06-28 21:53:50 -07:00
Rhet Turnbull	bb4bc8fd96	Added --description-template to CLI, closes #166	2020-06-28 20:10:38 -07:00
Rhet Turnbull	59507077ba	Updated README.md	2020-06-28 13:50:12 -07:00
Rhet Turnbull	ff0328785f	Added expand_inplace to PhotoTemplate.render	2020-06-28 13:46:35 -07:00
Rhet Turnbull	3693d65b82	Added --deleted, --deleted-only to CLI, closes #179	2020-06-28 10:02:36 -07:00
Rhet Turnbull	6a85bd215a	Updated CHANGELOG.md	2020-06-27 19:21:27 -07:00
Rhet Turnbull	ab36264af0	Changed default to PhotosDB.photos(movies=True), closes #177	2020-06-27 12:57:46 -07:00
Rhet Turnbull	185483e1aa	added intrash support for issue #179	2020-06-27 10:54:25 -07:00
Rhet Turnbull	c1d12047bd	Removed pdf filter on process_database_4	2020-06-26 20:04:53 -07:00
Rhet Turnbull	46c87eeed5	Added test for issue #178	2020-06-23 22:12:32 -07:00
Rhet Turnbull	fd4c99032d	Additional fix for issue #178	2020-06-23 12:21:46 -07:00
Rhet Turnbull	d6fee89fd9	version bump	2020-06-23 12:07:07 -07:00
Rhet Turnbull	b8618cf272	Bug fix for issue #178	2020-06-23 12:01:20 -07:00
Rhet Turnbull	6b7c5d07fd	Updated CHANGELOG.md	2020-06-22 07:22:19 -07:00
Rhet Turnbull	bd5ba702aa	Closes #174	2020-06-22 07:14:10 -07:00
Rhet Turnbull	c8d76a89e4	Added today to template system, closes #167	2020-06-21 21:58:18 -07:00
Rhet Turnbull	a8e996e660	Minor refactoring in photoinfo.py	2020-06-21 12:06:25 -07:00
Rhet Turnbull	c68a5ab39f	Updated CHANGELOG.md	2020-06-21 09:01:15 -07:00
Rhet Turnbull	1ebf995833	Bug fix for issue #172	2020-06-21 08:42:19 -07:00