test library update

CHANGELOG.md

@@ -4,6 +4,33 @@ 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.22.17](https://github.com/RhetTbull/osxphotos/compare/v0.22.16...v0.22.17)
+
+> 14 March 2020
+
+- Added MANIFEST.in [`279ab36`](https://github.com/RhetTbull/osxphotos/commit/279ab369295cfe1c778b38e212248271e4fc659e)
+- version bump [`783e097`](https://github.com/RhetTbull/osxphotos/commit/783e097da35a210a2aa5c75865a8599541b9da0b)
+
+#### [v0.22.16](https://github.com/RhetTbull/osxphotos/compare/v0.22.13...v0.22.16)
+
+> 14 March 2020
+
+- removed activate from --download-missing-photos Applescript, closes #69 [`#69`](https://github.com/RhetTbull/osxphotos/issues/69)
+- Added media type specials to json and string output, closes #68 [`#68`](https://github.com/RhetTbull/osxphotos/issues/68)
+- Added query/export options for special media types [`2b7d84a`](https://github.com/RhetTbull/osxphotos/commit/2b7d84a4d103982ad874d875bafbc34d654d539a)
+- README.md update [`a27ce33`](https://github.com/RhetTbull/osxphotos/commit/a27ce33473df3260dfb7ed26e28295cbf87d1e78)
+- Test library updates [`2d7d0b8`](https://github.com/RhetTbull/osxphotos/commit/2d7d0b86e0008cae043e314937504f36ad882990)
+- Fixed bug in --download-missing related to burst images [`1f13ba8`](https://github.com/RhetTbull/osxphotos/commit/1f13ba837fe36ff4eeb48cca02f5312a88a0a765)
+- test library update [`acb6b9e`](https://github.com/RhetTbull/osxphotos/commit/acb6b9e72f7f6b8f4f1d64b46f270a4d3e984fef)
+
+#### [v0.22.13](https://github.com/RhetTbull/osxphotos/compare/v0.22.12...v0.22.13)
+
+> 8 March 2020
+
+- Added media type specials, closes #60 [`#60`](https://github.com/RhetTbull/osxphotos/issues/60)
+- Updated CHANGELOG.md [`08a9793`](https://github.com/RhetTbull/osxphotos/commit/08a9793651481e1984a4482794ffedd48e4367a2)
+- Updated README.md [`1f8fd6e`](https://github.com/RhetTbull/osxphotos/commit/1f8fd6e929cc0edd3dd2f222416454d26955bf2a)
+
 #### [v0.22.12](https://github.com/RhetTbull/osxphotos/compare/0.22.10...v0.22.12)
 
 > 7 March 2020

MANIFEST.in

@@ -0,0 +1,2 @@
+include README.md
+include osxphotos/templates/*

README.md

@@ -3,13 +3,14 @@
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/python/black)
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 
+
 - [OSXPhotos](#osxphotos)
   * [What is osxphotos?](#what-is-osxphotos)
   * [Supported operating systems](#supported-operating-systems)
   * [Installation instructions](#installation-instructions)
   * [Command Line Usage](#command-line-usage)
-  * [Example uses of the module](#example-uses-of-the-module)
-  * [Module Interface](#module-interface)
+  * [Example uses of the package](#example-uses-of-the-package)
+  * [Package Interface](#package-interface)
     + [PhotosDB](#photosdb)
     + [PhotoInfo](#photoinfo)
     + [Utility Functions](#utility-functions)
@@ -18,17 +19,18 @@
   * [Contributing](#contributing)
   * [Implementation Notes](#implementation-notes)
   * [Dependencies](#dependencies)
-  * [Acknowledgements](#acknowledgements) 
+  * [Acknowledgements](#acknowledgements)
+
   
 ## What is osxphotos?
 
-OSXPhotos provides the ability to interact with and query Apple's Photos.app library database on MacOS. Using this module you can query the Photos database for information about the photos stored in a Photos library on your Mac--for example, file name, file path, and metadata such as keywords/tags, persons/faces, albums, etc. You can also easily export both the original and edited photos.
+OSXPhotos provides the ability to interact with and query Apple's Photos.app library database on MacOS. Using this package you can query the Photos database for information about the photos stored in a Photos library on your Mac--for example, file name, file path, and metadata such as keywords/tags, persons/faces, albums, etc. You can also easily export both the original and edited photos.
 
 ## Supported operating systems
 
 Only works on MacOS (aka Mac OS X). Tested on MacOS 10.12.6 / Photos 2.0, 10.13.6 / Photos 3.0, MacOS 10.14.5, 10.14.6 / Photos 4.0, MacOS 10.15.1 / Photos 5.0. Requires python >= 3.6
 
-This module will read Photos databases for any supported version on any supported OS version.  E.g. you can read a database created with Photos 4.0 on MacOS 10.14 on a machine running MacOS 10.12
+This package will read Photos databases for any supported version on any supported OS version.  E.g. you can read a database created with Photos 4.0 on MacOS 10.14 on a machine running MacOS 10.12
 
 
 ## Installation instructions
@@ -39,7 +41,7 @@ osxmetadata uses setuptools, thus simply run:
 
 ## Command Line Usage
 
-This module will install a command line utility called `osxphotos` that allows you to query the Photos database.  Alternatively, you can also run the command line utility like this: `python3 -m osxphotos`
+This package will install a command line utility called `osxphotos` that allows you to query the Photos database.  Alternatively, you can also run the command line utility like this: `python3 -m osxphotos`
 
 If you only care about the command line tool, I recommend installing with [pipx](https://github.com/pipxproject/pipx)
 
@@ -93,9 +95,15 @@ Options:
                                   order: 1. last opened library, 2. system
                                   library, 3. ~/Pictures/Photos
                                   Library.photoslibrary
-  --keyword KEYWORD               Search for keyword(s).
-  --person PERSON                 Search for person(s).
-  --album ALBUM                   Search for album(s).
+  --keyword KEYWORD               Search for keyword KEYWORD. If more than one
+                                  keyword, treated as "OR", e.g. find photos
+                                  match any keyword
+  --person PERSON                 Search for person PERSON. If more than one
+                                  person, treated as "OR", e.g. find photos
+                                  match any person
+  --album ALBUM                   Search for album ALBUM. If more than one
+                                  album, treated as "OR", e.g. find photos
+                                  match any album
   --uuid UUID                     Search for UUID(s).
   --title TITLE                   Search for TITLE in title of photo.
   --no-title                      Search for photos with no title.
@@ -122,7 +130,26 @@ Options:
                                   burst.
   --live                          Search for Apple live photos
   --not-live                      Search for photos that are not Apple live
-                                  photos
+                                  photos.
+  --portrait                      Search for Apple portrait mode photos.
+  --not-portrait                  Search for photos that are not Apple
+                                  portrait mode photos.
+  --screenshot                    Search for screenshot photos.
+  --not-screenshot                Search for photos that are not screenshot
+                                  photos.
+  --slow-mo                       Search for slow motion videos.
+  --not-slow-mo                   Search for photos that are not slow motion
+                                  videos.
+  --time-lapse                    Search for time lapse videos.
+  --not-time-lapse                Search for photos that are not time lapse
+                                  videos.
+  --hdr                           Search for high dynamic range (HDR) photos.
+  --not-hdr                       Search for photos that are not HDR photos.
+  --selfie                        Search for selfies (photos taken with front-
+                                  facing cameras).
+  --not-selfie                    Search for photos that are not selfies.
+  --panorama                      Search for panorama photos.
+  --not-panorama                  Search for photos that are not panoramas.
   --only-movies                   Search only for movies (default searches
                                   both images and movies).
   --only-photos                   Search only for photos/images (default
@@ -148,7 +175,9 @@ Options:
                                   edited version exists.  Edited photo will be
                                   named in form of "photoname_edited.ext"
   --export-bursts                 If a photo is a burst photo export all
-                                  associated burst images in the library.
+                                  associated burst images in the library.  Not
+                                  currently compatible with --download-
+                                  misssing; see note on --download-missing.
   --export-live                   If a photo is a live photo export the
                                   associated live video component.  Live video
                                   will have same name as photo but with .mov
@@ -164,7 +193,7 @@ Options:
                                   -j=photoname.json photoname.jpg" The sidecar
                                   file is named in format photoname.json
                                   --sidecar xmp: create XMP sidecar used by
-                                  Adobe Lightroom, etc. The sidecar file is
+                                  Adobe Lightroom, etc.The sidecar file is
                                   named in format photoname.xmp
   --download-missing              Attempt to download missing photos from
                                   iCloud. The current implementation uses
@@ -174,7 +203,10 @@ Options:
                                   exist on disk.  This will be slow and will
                                   require internet connection. This obviously
                                   only works if the Photos library is synched
-                                  to iCloud.
+                                  to iCloud.  Note: --download-missing is not
+                                  currently compatabile with --export-bursts;
+                                  only the primary photo will be exported--
+                                  associated burst images will be skipped.
   --exiftool                      Use exiftool to write metadata directly to
                                   exported photos. To use this option,
                                   exiftool must be installed and in the path.
@@ -193,7 +225,7 @@ Example: find all photos with keyword "Kids" and output results to json file nam
 
 `osxphotos query --keyword Kids --json ~/Pictures/Photos\ Library.photoslibrary >results.json`
 
-## Example uses of the module 
+## Example uses of the package 
 
 ```python
 import os.path
@@ -266,7 +298,7 @@ if __name__ == "__main__":
     main()
 ```
 
-## Module Interface
+## Package Interface
 
 ### PhotosDB
 
@@ -683,7 +715,7 @@ Returns a JSON representation of all photo info
 
 Export photo from the Photos library to another destination on disk.  
 - dest: must be valid destination path as str (or exception raised).
-- *filename (optional): name of picture as str; if not provided, will use current filename
+- *filename (optional): name of picture as str; if not provided, will use current filename.  **NOTE**: if provided, user must ensure file extension (suffix) is correct. For example, if photo is .CR2 file, edited image may be .jpeg.  If you provide an extension different than what the actual file is, export will print a warning but will happily export the photo using the incorrect file extension.  e.g. to get the extension of the edited photo, look at [PhotoInfo.path_edited](#path_edited).
 - edited: boolean; if True (default=False), will export the edited version of the photo (or raise exception if no edited version)
 - overwrite: boolean; if True (default=False), will overwrite files if they alreay exist
 - live_photo: boolean; if True (default=False), will also export the associted .mov for live photos; exported live photo will be named filename.mov
@@ -693,6 +725,7 @@ Export photo from the Photos library to another destination on disk.
 - use_photos_export: boolean; (default=False), if True will attempt to export photo via applescript interaction with Photos; useful for forcing download of missing photos.  This only works if the Photos library being used is the default library (last opened by Photos) as applescript will directly interact with whichever library Photos is currently using.
 - timeout: (int, default=120) timeout in seconds used with use_photos_export
 - exiftool: (boolean, default = False) if True, will use [exiftool](https://exiftool.org/) to write metadata directly to the exported photo; exiftool must be installed and in the system path
+Returns: list of paths to exported files. More than one file could be exported, for example if live_photo=True, both the original imaage and the associated .mov file will be exported
 
 The json sidecar file can be used by exiftool to apply the metadata from the json file to the image.  For example: 
 
@@ -710,7 +743,6 @@ Then
 
 If overwrite=False and increment=False, export will fail if destination file already exists
 
-Returns the full path to the exported file
 
 **Implementation Note**: Because the usual python file copy methods don't preserve all the metadata available on MacOS, export uses /usr/bin/ditto to do the copy for export. ditto preserves most metadata such as extended attributes, permissions, ACLs, etc.
 
@@ -805,17 +837,17 @@ Contributing is easy!  if you find bugs or want to suggest additional features/c
 
 I'll gladly consider pull requests for bug fixes or feature implementations.  
 
-If you have an interesting example that shows usage of this module, submit an issue or pull request and i'll include it or link to it.
+If you have an interesting example that shows usage of this package, submit an issue or pull request and i'll include it or link to it.
 
 Testing against "real world" Photos libraries would be especially helpful.  If you discover issues in testing against your Photos libraries, please open an issue.  I've done extensive testing against my own Photos library but that's a since data point and I'm certain there are issues lurking in various edge cases I haven't discovered yet.
 
 ## Implementation Notes
 
-This module works by creating a copy of the sqlite3 database that photos uses to store data about the photos library. the class photosdb then queries this database to extract information about the photos such as persons (faces identified in the photos), albums, keywords, etc.  If your library is large, the database can be hundreds of MB in size and the copy then read can take many 10s of seconds to complete.  Once copied, the entire database is processed and an in-memory data structure is created meaning all subsequent accesses of the PhotosDB object occur much more quickly. 
+This packge works by creating a copy of the sqlite3 database that photos uses to store data about the photos library. the class photosdb then queries this database to extract information about the photos such as persons (faces identified in the photos), albums, keywords, etc.  If your library is large, the database can be hundreds of MB in size and the copy then read can take many 10s of seconds to complete.  Once copied, the entire database is processed and an in-memory data structure is created meaning all subsequent accesses of the PhotosDB object occur much more quickly. 
 
 If apple changes the database format this will likely break.
 
-Apple does provide a framework ([PhotoKit](https://developer.apple.com/documentation/photokit?language=objc)) for querying the user's Photos library and I attempted to create the funcationality in this module using this framework but unfortunately PhotoKit does not provide access to much of the needed metadata (such as Faces/Persons).  While copying the sqlite file is a bit kludgy, it allows osxphotos to provide access to all available metadata.
+Apple does provide a framework ([PhotoKit](https://developer.apple.com/documentation/photokit?language=objc)) for querying the user's Photos library and I attempted to create the funcationality in this package using this framework but unfortunately PhotoKit does not provide access to much of the needed metadata (such as Faces/Persons).  While copying the sqlite file is a bit kludgy, it allows osxphotos to provide access to all available metadata.
 
 ## Dependencies
 - [PyObjC](https://pythonhosted.org/pyobjc/)
@@ -826,5 +858,5 @@ Apple does provide a framework ([PhotoKit](https://developer.apple.com/documenta
 ## Acknowledgements
 This project was originally inspired by [photo-export](https://github.com/patrikhson/photo-export) by Patrick Fältström,  Copyright (c) 2015 Patrik Fältström paf@frobbit.se
 
-I use [py-applescript](https://github.com/rdhyee/py-applescript) by "Raymond Yee / rdhyee" to interact with Photos. Rather than import this module, I included the entire module (which is published as public domain code) in a private module to prevent ambiguity with other applescript modules on PyPi. py-applescript uses a native bridge via PyObjC and is very fast compared to the other osascript based modules.
+I use [py-applescript](https://github.com/rdhyee/py-applescript) by "Raymond Yee / rdhyee" to interact with Photos. Rather than import this package, I included the entire package (which is published as public domain code) in a private package to prevent ambiguity with other applescript packages on PyPi. py-applescript uses a native bridge via PyObjC and is very fast compared to the other osascript based packages.
 

osxphotos/__main__.py

@@ -192,7 +192,45 @@ def query_options(f):
         o(
             "--not-live",
             is_flag=True,
-            help="Search for photos that are not Apple live photos",
+            help="Search for photos that are not Apple live photos.",
+        ),
+        o("--portrait", is_flag=True, help="Search for Apple portrait mode photos."),
+        o(
+            "--not-portrait",
+            is_flag=True,
+            help="Search for photos that are not Apple portrait mode photos.",
+        ),
+        o("--screenshot", is_flag=True, help="Search for screenshot photos."),
+        o(
+            "--not-screenshot",
+            is_flag=True,
+            help="Search for photos that are not screenshot photos.",
+        ),
+        o("--slow-mo", is_flag=True, help="Search for slow motion videos."),
+        o(
+            "--not-slow-mo",
+            is_flag=True,
+            help="Search for photos that are not slow motion videos.",
+        ),
+        o("--time-lapse", is_flag=True, help="Search for time lapse videos."),
+        o(
+            "--not-time-lapse",
+            is_flag=True,
+            help="Search for photos that are not time lapse videos.",
+        ),
+        o("--hdr", is_flag=True, help="Search for high dynamic range (HDR) photos."),
+        o("--not-hdr", is_flag=True, help="Search for photos that are not HDR photos."),
+        o(
+            "--selfie",
+            is_flag=True,
+            help="Search for selfies (photos taken with front-facing cameras).",
+        ),
+        o("--not-selfie", is_flag=True, help="Search for photos that are not selfies."),
+        o("--panorama", is_flag=True, help="Search for panorama photos."),
+        o(
+            "--not-panorama",
+            is_flag=True,
+            help="Search for photos that are not panoramas.",
         ),
         o(
             "--only-movies",
@@ -508,6 +546,20 @@ def query(
     not_incloud,
     from_date,
     to_date,
+    portrait,
+    not_portrait,
+    screenshot,
+    not_screenshot,
+    slow_mo,
+    not_slow_mo,
+    time_lapse,
+    not_time_lapse,
+    hdr,
+    not_hdr,
+    selfie,
+    not_selfie,
+    panorama,
+    not_panorama,
 ):
     """ Query the Photos database using 1 or more search options; 
         if more than one option is provided, they are treated as "AND" 
@@ -538,6 +590,13 @@ def query(
         (live, not_live),
         (cloudasset, not_cloudasset),
         (incloud, not_incloud),
+        (portrait, not_portrait),
+        (screenshot, not_screenshot),
+        (slow_mo, not_slow_mo),
+        (time_lapse, not_time_lapse),
+        (hdr, not_hdr),
+        (selfie, not_selfie),
+        (panorama, not_panorama),
     ]
     # 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]):
@@ -594,6 +653,20 @@ def query(
         not_incloud=not_incloud,
         from_date=from_date,
         to_date=to_date,
+        portrait=portrait,
+        not_portrait=not_portrait,
+        screenshot=screenshot,
+        not_screenshot=not_screenshot,
+        slow_mo=slow_mo,
+        not_slow_mo=not_slow_mo,
+        time_lapse=time_lapse,
+        not_time_lapse=not_time_lapse,
+        hdr=hdr,
+        not_hdr=not_hdr,
+        selfie=selfie,
+        not_selfie=not_selfie,
+        panorama=panorama,
+        not_panorama=not_panorama,
     )
 
     # below needed for to make CliRunner work for testing
@@ -628,7 +701,8 @@ def query(
 @click.option(
     "--export-bursts",
     is_flag=True,
-    help="If a photo is a burst photo export all associated burst images in the library.",
+    help="If a photo is a burst photo export all associated burst images in the library.  "
+    "Not currently compatible with --download-misssing; see note on --download-missing.",
 )
 @click.option(
     "--export-live",
@@ -661,7 +735,9 @@ def query(
     help="Attempt to download missing photos from iCloud. The current implementation uses Applescript "
     "to interact with Photos to export the photo which will force Photos to download from iCloud if "
     "the photo does not exist on disk.  This will be slow and will require internet connection. "
-    "This obviously only works if the Photos library is synched to iCloud.",
+    "This obviously only works if the Photos library is synched to iCloud.  "
+    "Note: --download-missing is not currently compatabile with --export-bursts; "
+    "only the primary photo will be exported--associated burst images will be skipped.",
 )
 @click.option(
     "--exiftool",
@@ -716,6 +792,20 @@ def export(
     download_missing,
     dest,
     exiftool,
+    portrait,
+    not_portrait,
+    screenshot,
+    not_screenshot,
+    slow_mo,
+    not_slow_mo,
+    time_lapse,
+    not_time_lapse,
+    hdr,
+    not_hdr,
+    selfie,
+    not_selfie,
+    panorama,
+    not_panorama,
 ):
     """ Export photos from the Photos database.
         Export path DEST is required.
@@ -737,6 +827,13 @@ def export(
         (only_photos, only_movies),
         (burst, not_burst),
         (live, not_live),
+        (portrait, not_portrait),
+        (screenshot, not_screenshot),
+        (slow_mo, not_slow_mo),
+        (time_lapse, not_time_lapse),
+        (hdr, not_hdr),
+        (selfie, not_selfie),
+        (panorama, not_panorama),
     ]
     if any([all(bb) for bb in exclusive]):
         click.echo(cli.commands["export"].get_help(ctx), err=True)
@@ -803,6 +900,20 @@ def export(
         not_incloud=False,
         from_date=from_date,
         to_date=to_date,
+        portrait=portrait,
+        not_portrait=not_portrait,
+        screenshot=screenshot,
+        not_screenshot=not_screenshot,
+        slow_mo=slow_mo,
+        not_slow_mo=not_slow_mo,
+        time_lapse=time_lapse,
+        not_time_lapse=not_time_lapse,
+        hdr=hdr,
+        not_hdr=not_hdr,
+        selfie=selfie,
+        not_selfie=not_selfie,
+        panorama=panorama,
+        not_panorama=not_panorama,
     )
 
     if photos:
@@ -911,6 +1022,13 @@ def print_photo_info(photos, json=False):
                 "iscloudasset",
                 "incloud",
                 "date_modified",
+                "portrait",
+                "screenshot",
+                "slow_mo",
+                "time_lapse",
+                "hdr",
+                "selfie",
+                "panorama",
             ]
         )
         for p in photos:
@@ -945,6 +1063,13 @@ def print_photo_info(photos, json=False):
                     p.iscloudasset,
                     p.incloud,
                     date_modified_iso,
+                    p.portrait,
+                    p.screenshot,
+                    p.slow_mo,
+                    p.time_lapse,
+                    p.hdr,
+                    p.selfie,
+                    p.panorama,
                 ]
             )
         for row in dump:
@@ -985,6 +1110,20 @@ def _query(
     not_incloud=None,
     from_date=None,
     to_date=None,
+    portrait=None,
+    not_portrait=None,
+    screenshot=None,
+    not_screenshot=None,
+    slow_mo=None,
+    not_slow_mo=None,
+    time_lapse=None,
+    not_time_lapse=None,
+    hdr=None,
+    not_hdr=None,
+    selfie=None,
+    not_selfie=None,
+    panorama=None,
+    not_panorama=None,
 ):
     """ run a query against PhotosDB to extract the photos based on user supply criteria """
     """ used by query and export commands """
@@ -1077,6 +1216,41 @@ def _query(
     elif not_live:
         photos = [p for p in photos if not p.live_photo]
 
+    if portrait:
+        photos = [p for p in photos if p.portrait]
+    elif not_portrait:
+        photos = [p for p in photos if not p.portrait]
+
+    if screenshot:
+        photos = [p for p in photos if p.screenshot]
+    elif not_screenshot:
+        photos = [p for p in photos if not p.screenshot]
+
+    if slow_mo:
+        photos = [p for p in photos if p.slow_mo]
+    elif not_slow_mo:
+        photos = [p for p in photos if not p.slow_mo]
+
+    if time_lapse:
+        photos = [p for p in photos if p.time_lapse]
+    elif not_time_lapse:
+        photos = [p for p in photos if not p.time_lapse]
+
+    if hdr:
+        photos = [p for p in photos if p.hdr]
+    elif not_hdr:
+        photos = [p for p in photos if not p.hdr]
+
+    if selfie:
+        photos = [p for p in photos if p.selfie]
+    elif not_selfie:
+        photos = [p for p in photos if not p.selfie]
+
+    if panorama:
+        photos = [p for p in photos if p.panorama]
+    elif not_panorama:
+        photos = [p for p in photos if not p.panorama]
+
     if cloudasset:
         photos = [p for p in photos if p.iscloudasset]
     elif not_cloudasset:
@@ -1156,6 +1330,11 @@ def export_photo(
     if "xmp" in sidecar:
         sidecar_xmp = True
 
+    # if download_missing and the photo is missing or path doesn't exist,
+    # try to download with Photos
+    use_photos_export = download_missing and (
+        photo.ismissing or not os.path.exists(photo.path)
+    )
     photo_path = photo.export(
         dest,
         filename,
@@ -1163,16 +1342,28 @@ def export_photo(
         sidecar_xmp=sidecar_xmp,
         live_photo=export_live,
         overwrite=overwrite,
-        use_photos_export=download_missing,
+        use_photos_export=use_photos_export,
         exiftool=exiftool,
-    )
+    )[0]
 
     # if export-edited, also export the edited version
     # verify the photo has adjustments and valid path to avoid raising an exception
     if export_edited and photo.hasadjustments:
-        if download_missing or photo.path_edited is not None:
+        # if download_missing and the photo is missing or path doesn't exist,
+        # try to download with Photos
+        use_photos_export = download_missing and photo.path_edited is None
+        if not download_missing and photo.path_edited is None:
+            click.echo(f"Skipping missing edited photo for {filename}")
+        else:
             edited_name = pathlib.Path(filename)
-            edited_name = f"{edited_name.stem}_edited{edited_name.suffix}"
+            # check for correct edited suffix
+            if photo.path_edited is not None:
+                edited_suffix = pathlib.Path(photo.path_edited).suffix
+            else:
+                # use filename suffix which might be wrong,
+                # will be corrected by use_photos_export
+                edited_suffix = pathlib.Path(photo.filename).suffix
+            edited_name = f"{edited_name.stem}_edited{edited_suffix}"
             if verbose:
                 click.echo(f"Exporting edited version of {filename} as {edited_name}")
             photo.export(
@@ -1182,14 +1373,13 @@ def export_photo(
                 sidecar_xmp=sidecar_xmp,
                 overwrite=overwrite,
                 edited=True,
-                use_photos_export=download_missing,
+                use_photos_export=use_photos_export,
                 exiftool=exiftool,
             )
-        else:
-            click.echo(f"Skipping missing edited photo for {filename}")
 
     return photo_path
 
 
 if __name__ == "__main__":
-    cli()
+    cli()  # pylint: disable=no-value-for-parameter
+

osxphotos/_version.py

@@ -1,3 +1,3 @@
 """ version info """
 
-__version__ = "0.22.13"
+__version__ = "0.22.23"

osxphotos/photoinfo.py

@@ -505,7 +505,13 @@ class PhotoInfo:
     ):
         """ export photo 
             dest: must be valid destination path (or exception raised) 
-            filename: (optional): name of picture; if not provided, will use current filename 
+            filename: (optional): name of exported picture; if not provided, will use current filename 
+                      **NOTE**: if provided, user must ensure file extension (suffix) is correct. 
+                      For example, if photo is .CR2 file, edited image may be .jpeg.  
+                      If you provide an extension different than what the actual file is, 
+                      export will print a warning but will happily export the photo using the 
+                      incorrect file extension.  e.g. to get the extension of the edited photo, 
+                      reference PhotoInfo.path_edited
             edited: (boolean, default=False); if True will export the edited version of the photo 
                     (or raise exception if no edited version) 
             live_photo: (boolean, default=False); if True, will also export the associted .mov for live photos
@@ -519,14 +525,18 @@ class PhotoInfo:
             use_photos_export: (boolean, default=False); if True will attempt to export photo via applescript interaction with Photos
             timeout: (int, default=120) timeout in seconds used with use_photos_export
             exiftool: (boolean, default = False); if True, will use exiftool to write metadata to export file
-            returns the full path to the exported file """
-
-        # TODO: add this docs:
-        #  ( for jpeg in *.jpeg; do exiftool -v -json=$jpeg.json $jpeg; done )
+            returns list of full paths to the exported files """
 
         # list of all files exported during this call to export
         exported_files = []
 
+        # check edited and raise exception trying to export edited version of
+        # photo that hasn't been edited
+        if edited and not self.hasadjustments:
+            raise ValueError(
+                "Photo does not have adjustments, cannot export edited version"
+            )
+
         # check arguments and get destination path and filename (if provided)
         if filename and len(filename) > 2:
             raise TypeError(
@@ -540,8 +550,8 @@ class PhotoInfo:
                 raise FileNotFoundError("Invalid path passed to export")
 
             if filename and len(filename) == 1:
-                # second arg is filename of picture
-                filename = filename[0]
+                # if filename passed, use it
+                fname = filename[0]
             else:
                 # no filename provided so use the default
                 # if edited file requested, use filename but add _edited
@@ -555,16 +565,32 @@ class PhotoInfo:
                         )
                     edited_name = pathlib.Path(self.path_edited).name
                     edited_suffix = pathlib.Path(edited_name).suffix
-                    filename = (
-                        pathlib.Path(self.filename).stem + "_edited" + edited_suffix
-                    )
+                    fname = pathlib.Path(self.filename).stem + "_edited" + edited_suffix
                 else:
-                    filename = self.filename
+                    fname = self.filename
 
         # check destination path
         dest = pathlib.Path(dest)
-        filename = pathlib.Path(filename)
-        dest = dest / filename
+        fname = pathlib.Path(fname)
+        dest = dest / fname
+
+        # check extension of destination
+        if edited and self.path_edited is not None:
+            # use suffix from edited file
+            actual_suffix = pathlib.Path(self.path_edited).suffix
+        elif edited:
+            # use .jpeg as that's probably correct
+            # if edited and path_edited is None, will raise FileNotFoundError below
+            # unless use_photos_export is True
+            actual_suffix = ".jpeg"
+        else:
+            # use suffix from the non-edited file
+            actual_suffix = pathlib.Path(self.filename).suffix
+
+        if dest.suffix != actual_suffix:
+            logging.warning(
+                f"Invalid destination suffix: {dest.suffix}, should be {actual_suffix}"
+            )
 
         # check to see if file exists and if so, add (1), (2), etc until we find one that works
         # Photos checks the stem and adds (1), (2), etc which avoids collision with sidecars
@@ -593,16 +619,11 @@ class PhotoInfo:
             # get path to source file and verify it's not None and is valid file
             # TODO: how to handle ismissing or not hasadjustments and edited=True cases?
             if edited:
-                if not self.hasadjustments:
-                    logging.warning(
-                        "Attempting to export edited photo but hasadjustments=False"
-                    )
-
                 if self.path_edited is not None:
                     src = self.path_edited
                 else:
                     raise FileNotFoundError(
-                        f"edited=True but path_edited is none; hasadjustments: {self.hasadjustments}"
+                        f"Cannot export edited photo if path_edited is None"
                     )
             else:
                 if self.ismissing:
@@ -610,13 +631,10 @@ class PhotoInfo:
                         f"Attempting to export photo with ismissing=True: path = {self.path}"
                     )
 
-                if self.path is None:
-                    logging.warning(
-                        f"Attempting to export photo but path is None: ismissing = {self.ismissing}"
-                    )
-                    raise FileNotFoundError("Cannot export photo if path is None")
-                else:
+                if self.path is not None:
                     src = self.path
+                else:
+                    raise FileNotFoundError("Cannot export photo if path is None")
 
             if not os.path.isfile(src):
                 raise FileNotFoundError(f"{src} does not appear to exist")
@@ -655,15 +673,18 @@ class PhotoInfo:
                 else:
                     # didn't get passed a filename, add _edited
                     filestem = f"{dest.stem}_edited"
-                    exported = _export_photo_uuid_applescript(
-                        self.uuid,
-                        dest.parent,
-                        filestem=filestem,
-                        original=False,
-                        edited=True,
-                        live_photo=live_photo,
-                        timeout=timeout,
-                    )
+                    dest = dest.parent / f"{filestem}.jpeg"
+
+                exported = _export_photo_uuid_applescript(
+                    self.uuid,
+                    dest.parent,
+                    filestem=filestem,
+                    original=False,
+                    edited=True,
+                    live_photo=live_photo,
+                    timeout=timeout,
+                    burst=self.burst,
+                )
             else:
                 # export original version and not edited
                 filestem = dest.stem
@@ -675,12 +696,15 @@ class PhotoInfo:
                     edited=False,
                     live_photo=live_photo,
                     timeout=timeout,
+                    burst=self.burst,
                 )
 
             if exported is not None:
                 exported_files.extend(exported)
             else:
-                logging.warning(f"Error exporting photo {self.uuid} to {dest}")
+                logging.warning(
+                    f"Error exporting photo {self.uuid} to {dest} with use_photos_export"
+                )
 
         if sidecar_json:
             logging.debug("writing exiftool_json_sidecar")
@@ -702,14 +726,12 @@ class PhotoInfo:
                 logging.warning(f"Error writing xmp sidecar to {sidecar_filename}")
                 raise e
 
-        logging.debug(f"export exported_files: {exported_files}")
-
         # if exiftool, write the metadata
         if exiftool and exported_files:
             for exported_file in exported_files:
                 self._write_exif_data(exported_file)
 
-        return str(dest)
+        return exported_files
 
     def _write_exif_data(self, filepath):
         """ write exif data to image file at filepath
@@ -749,7 +771,6 @@ class PhotoInfo:
 
         exif = {}
         exif["_CreatedBy"] = "osxphotos, https://github.com/RhetTbull/osxphotos"
-        exif["File:FileName"] = self.filename
 
         if self.description:
             exif["EXIF:ImageDescription"] = self.description
@@ -882,6 +903,13 @@ class PhotoInfo:
             "iscloudasset": self.iscloudasset,
             "incloud": self.incloud,
             "date_modified": date_modified_iso,
+            "portrait": self.portrait,
+            "screenshot": self.screenshot,
+            "slow_mo": self.slow_mo,
+            "time_lapse": self.time_lapse,
+            "hdr": self.hdr,
+            "selfie": self.selfie,
+            "panorama": self.panorama,
         }
         return yaml.dump(info, sort_keys=False)
 
@@ -921,6 +949,13 @@ class PhotoInfo:
             "iscloudasset": self.iscloudasset,
             "incloud": self.incloud,
             "date_modified": date_modified_iso,
+            "portrait": self.portrait,
+            "screenshot": self.screenshot,
+            "slow_mo": self.slow_mo,
+            "time_lapse": self.time_lapse,
+            "hdr": self.hdr,
+            "selfie": self.selfie,
+            "panorama": self.panorama,
         }
         return json.dumps(pic)
 

osxphotos/utils.py

@@ -255,7 +255,7 @@ def list_photo_libraries():
     # On older MacOS versions, mdfind appears to ignore some libraries
     # glob to find libraries in ~/Pictures then mdfind to find all the others
     # TODO: make this more robust
-    lib_list = glob.glob(f"{str(Path.home())}/Pictures/*.photoslibrary")
+    lib_list = glob.glob(f"{str(pathlib.Path.home())}/Pictures/*.photoslibrary")
 
     # On older OS, may not get all libraries so make sure we get the last one
     last_lib = get_last_library_path()
@@ -299,8 +299,7 @@ def create_path_by_date(dest, dt):
 #         f"""
 #         on openLibrary
 #             tell application "Photos"
-# 	         activate
-# 	         open POSIX file "{library_path}"
+# 	          open POSIX file "{library_path}"
 #             end tell
 #         end openLibrary
 #         """
@@ -316,6 +315,7 @@ def _export_photo_uuid_applescript(
     edited=False,
     live_photo=False,
     timeout=120,
+    burst=False,
 ):
     """ Export photo to dest path using applescript to control Photos
         If photo is a live photo, exports both the photo and associated .mov file
@@ -327,11 +327,13 @@ def _export_photo_uuid_applescript(
                   If filestem.ext exists, it wil be overwritten
         original: (boolean) if True, export original image; default = True
         edited: (boolean) if True, export edited photo; default = False
-                will produce an error if image does not have edits/adjustments 
+                If photo not edited and edited=True, will still export the original image
+                caller must verify image has been edited
         *Note*: must be called with either edited or original but not both, 
                 will raise error if called with both edited and original = True
         live_photo: (boolean) if True, export associated .mov live photo; default = False
         timeout: timeout value in seconds; export will fail if applescript run time exceeds timeout
+        burst: (boolean) set to True if file is a burst image to avoid Photos export error
         Returns: list of paths to exported file(s) or None if export failed
         Note: For Live Photos, if edited=True, will export a jpeg but not the movie, even if photo
               has not been edited. This is due to how Photos Applescript interface works.
@@ -342,7 +344,6 @@ def _export_photo_uuid_applescript(
         """ 
 		on export_by_uuid(theUUID, thePath, original, edited, theTimeOut)
 			tell application "Photos"
-				activate
 				set thePath to thePath
 				set theItem to media item id theUUID
 				set theFilename to filename of theItem
@@ -390,6 +391,7 @@ def _export_photo_uuid_applescript(
         # need to find actual filename as sometimes Photos renames JPG to jpeg on export
         # may be more than one file exported (e.g. if Live Photo, Photos exports both .jpeg and .mov)
         # TemporaryDirectory will cleanup on return
+        filename_stem = pathlib.Path(filename).stem
         files = glob.glob(os.path.join(tmpdir.name, "*"))
         exported_paths = []
         for fname in files:
@@ -398,6 +400,10 @@ def _export_photo_uuid_applescript(
                 # it's the .mov part of live photo but not requested, so don't export
                 logging.debug(f"Skipping live photo file {path}")
                 continue
+            if len(files) > 1 and burst and path.stem != filename_stem:
+                # skip any burst photo that's not the one we asked for
+                logging.debug(f"Skipping burst photo file {path}")
+                continue
             if filestem:
                 # rename the file based on filestem, keeping original extension
                 dest_new = dest / f"{filestem}{path.suffix}"
@@ -443,7 +449,7 @@ def _db_is_locked(dbname):
         conn.close()
         logging.debug(f"{dbname} is not locked")
         locked = False
-    except Exception as e:
+    except:
         logging.debug(f"{dbname} is locked")
         locked = True
 

setup.py

@@ -50,7 +50,7 @@ setup(
     url="https://github.com/RhetTbull/",
     project_urls={"GitHub": "https://github.com/RhetTbull/osxphotos"},
     download_url="https://github.com/RhetTbull/osxphotos",
-    packages=find_packages(exclude=["tests", "examples"]),
+    packages=find_packages(exclude=["tests", "examples", "utils"]),
     license="License :: OSI Approved :: MIT License",
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -63,4 +63,5 @@ setup(
     ],
     install_requires=["pyobjc>=6.0.1", "Click>=7", "PyYAML>=5.1.2", "Mako>=1.1.1"],
     entry_points={"console_scripts": ["osxphotos=osxphotos.__main__:cli"]},
+    include_package_data=True,
 )

tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock

@@ -7,7 +7,7 @@
 	<key>hostuuid</key>
 	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
 	<key>pid</key>
-	<integer>1134</integer>
+	<integer>441</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>

tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist

@@ -3,24 +3,24 @@
 <plist version="1.0">
 <dict>
 	<key>BackgroundHighlightCollection</key>
-	<date>2020-03-07T16:11:53Z</date>
+	<date>2020-03-15T10:17:08Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2020-03-07T16:11:53Z</date>
+	<date>2020-03-15T10:17:07Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2020-03-07T18:15:22Z</date>
+	<date>2020-03-15T11:59:15Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2020-03-07T16:11:53Z</date>
+	<date>2020-03-15T10:17:08Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2020-03-07T16:11:52Z</date>
+	<date>2020-03-15T10:17:07Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2020-03-07T08:11:00Z</date>
+	<date>2020-03-15T06:53:11Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
-	<date>2020-03-07T18:15:23Z</date>
+	<date>2020-03-15T11:59:15Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-03-07T08:10:59Z</date>
+	<date>2020-03-15T06:53:11Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-03-07T18:15:22Z</date>
+	<date>2020-03-15T10:17:08Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2020-03-07T08:11:00Z</date>
+	<date>2020-03-15T06:53:11Z</date>
 </dict>
 </plist>

tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist

@@ -3,8 +3,8 @@
 <plist version="1.0">
 <dict>
 	<key>FaceIDModelLastGenerationKey</key>
-	<date>2020-03-07T08:11:01Z</date>
+	<date>2020-03-15T06:53:12Z</date>
 	<key>LastContactClassificationKey</key>
-	<date>2020-03-07T08:11:02Z</date>
+	<date>2020-03-15T06:53:13Z</date>
 </dict>
 </plist>

tests/Test-RAW-10.15.1.photoslibrary/database/DataModelVersion.plist

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LibrarySchemaVersion</key>
+	<integer>5001</integer>
+	<key>MetaSchemaVersion</key>
+	<integer>3</integer>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/database/Photos.sqlite.lock

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>hostname</key>
+	<string>Rhets-MacBook-Pro.local</string>
+	<key>hostuuid</key>
+	<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
+	<key>pid</key>
+	<integer>441</integer>
+	<key>processname</key>
+	<string>photolibraryd</string>
+	<key>uid</key>
+	<integer>501</integer>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/database/search/searchMetadata.plist

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BlacklistedMeaningsByMeaning</key>
+	<dict/>
+	<key>MePersonUUID</key>
+	<string>39488755-78C0-40B2-B378-EDA280E1823C</string>
+	<key>SceneWhitelist</key>
+	<array>
+		<string>Graduation</string>
+		<string>Aquarium</string>
+		<string>Food</string>
+		<string>Ice Skating</string>
+		<string>Mountain</string>
+		<string>Cliff</string>
+		<string>Basketball</string>
+		<string>Tennis</string>
+		<string>Jewelry</string>
+		<string>Cheese</string>
+		<string>Softball</string>
+		<string>Football</string>
+		<string>Circus</string>
+		<string>Jet Ski</string>
+		<string>Playground</string>
+		<string>Carousel</string>
+		<string>Paint Ball</string>
+		<string>Windsurfing</string>
+		<string>Sailboat</string>
+		<string>Sunbathing</string>
+		<string>Dam</string>
+		<string>Fireplace</string>
+		<string>Flower</string>
+		<string>Scuba</string>
+		<string>Hiking</string>
+		<string>Cetacean</string>
+		<string>Pier</string>
+		<string>Bowling</string>
+		<string>Snowboarding</string>
+		<string>Zoo</string>
+		<string>Snowmobile</string>
+		<string>Theater</string>
+		<string>Boat</string>
+		<string>Casino</string>
+		<string>Car</string>
+		<string>Diving</string>
+		<string>Cycling</string>
+		<string>Musical Instrument</string>
+		<string>Board Game</string>
+		<string>Castle</string>
+		<string>Sunset Sunrise</string>
+		<string>Martial Arts</string>
+		<string>Motocross</string>
+		<string>Submarine</string>
+		<string>Cat</string>
+		<string>Snow</string>
+		<string>Kiteboarding</string>
+		<string>Squash</string>
+		<string>Geyser</string>
+		<string>Music</string>
+		<string>Archery</string>
+		<string>Desert</string>
+		<string>Blackjack</string>
+		<string>Fireworks</string>
+		<string>Sportscar</string>
+		<string>Feline</string>
+		<string>Soccer</string>
+		<string>Museum</string>
+		<string>Baby</string>
+		<string>Fencing</string>
+		<string>Railroad</string>
+		<string>Nascar</string>
+		<string>Sky Surfing</string>
+		<string>Bird</string>
+		<string>Games</string>
+		<string>Baseball</string>
+		<string>Dressage</string>
+		<string>Snorkeling</string>
+		<string>Pyramid</string>
+		<string>Kite</string>
+		<string>Rowboat</string>
+		<string>Golf</string>
+		<string>Watersports</string>
+		<string>Lightning</string>
+		<string>Canyon</string>
+		<string>Auditorium</string>
+		<string>Night Sky</string>
+		<string>Karaoke</string>
+		<string>Skiing</string>
+		<string>Parade</string>
+		<string>Forest</string>
+		<string>Hot Air Balloon</string>
+		<string>Dragon Parade</string>
+		<string>Easter Egg</string>
+		<string>Monument</string>
+		<string>Jungle</string>
+		<string>Thanksgiving</string>
+		<string>Jockey Horse</string>
+		<string>Stadium</string>
+		<string>Airplane</string>
+		<string>Ballet</string>
+		<string>Yoga</string>
+		<string>Coral Reef</string>
+		<string>Skating</string>
+		<string>Wrestling</string>
+		<string>Bicycle</string>
+		<string>Tattoo</string>
+		<string>Amusement Park</string>
+		<string>Canoe</string>
+		<string>Cheerleading</string>
+		<string>Ping Pong</string>
+		<string>Fishing</string>
+		<string>Magic</string>
+		<string>Reptile</string>
+		<string>Winter Sport</string>
+		<string>Waterfall</string>
+		<string>Train</string>
+		<string>Bonsai</string>
+		<string>Surfing</string>
+		<string>Dog</string>
+		<string>Cake</string>
+		<string>Sledding</string>
+		<string>Sandcastle</string>
+		<string>Glacier</string>
+		<string>Lighthouse</string>
+		<string>Equestrian</string>
+		<string>Rafting</string>
+		<string>Shore</string>
+		<string>Hockey</string>
+		<string>Santa Claus</string>
+		<string>Formula One Car</string>
+		<string>Sport</string>
+		<string>Vehicle</string>
+		<string>Boxing</string>
+		<string>Rollerskating</string>
+		<string>Underwater</string>
+		<string>Orchestra</string>
+		<string>Carnival</string>
+		<string>Rocket</string>
+		<string>Skateboarding</string>
+		<string>Helicopter</string>
+		<string>Performance</string>
+		<string>Oktoberfest</string>
+		<string>Water Polo</string>
+		<string>Skate Park</string>
+		<string>Animal</string>
+		<string>Nightclub</string>
+		<string>String Instrument</string>
+		<string>Dinosaur</string>
+		<string>Gymnastics</string>
+		<string>Cricket</string>
+		<string>Volcano</string>
+		<string>Lake</string>
+		<string>Aurora</string>
+		<string>Dancing</string>
+		<string>Concert</string>
+		<string>Rock Climbing</string>
+		<string>Hang Glider</string>
+		<string>Rodeo</string>
+		<string>Fish</string>
+		<string>Art</string>
+		<string>Motorcycle</string>
+		<string>Volleyball</string>
+		<string>Wake Boarding</string>
+		<string>Badminton</string>
+		<string>Motor Sport</string>
+		<string>Sumo</string>
+		<string>Parasailing</string>
+		<string>Skydiving</string>
+		<string>Kickboxing</string>
+		<string>Pinata</string>
+		<string>Foosball</string>
+		<string>Go Kart</string>
+		<string>Poker</string>
+		<string>Kayak</string>
+		<string>Swimming</string>
+		<string>Atv</string>
+		<string>Beach</string>
+		<string>Dartboard</string>
+		<string>Athletics</string>
+		<string>Camping</string>
+		<string>Tornado</string>
+		<string>Billiards</string>
+		<string>Rugby</string>
+		<string>Airshow</string>
+	</array>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/database/search/searchProgress.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>insertAlbum</key>
+	<array/>
+	<key>insertAsset</key>
+	<array/>
+	<key>insertHighlight</key>
+	<array/>
+	<key>insertMemory</key>
+	<array/>
+	<key>insertMoment</key>
+	<array/>
+	<key>removeAlbum</key>
+	<array/>
+	<key>removeAsset</key>
+	<array/>
+	<key>removeHighlight</key>
+	<array/>
+	<key>removeMemory</key>
+	<array/>
+	<key>removeMoment</key>
+	<array/>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/database/search/searchSystemInfo.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>embeddingVersion</key>
+	<string>1</string>
+	<key>localeIdentifier</key>
+	<string>en_US</string>
+	<key>sceneTaxonomySHA</key>
+	<string>87914a047c69fbe8013fad2c70fa70c6c03b08b56190fe4054c880e6b9f57cc3</string>
+	<key>searchIndexVersion</key>
+	<string>10</string>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/private/com.apple.Photos/appPrivateData.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CollapsedSidebarSectionIdentifiers</key>
+	<array/>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>BackgroundHighlightCollection</key>
+	<date>2020-03-14T20:12:46Z</date>
+	<key>BackgroundHighlightEnrichment</key>
+	<date>2020-03-14T20:12:46Z</date>
+	<key>BackgroundJobAssetRevGeocode</key>
+	<date>2020-03-14T20:12:46Z</date>
+	<key>BackgroundJobSearch</key>
+	<date>2020-03-14T20:12:46Z</date>
+	<key>BackgroundPeopleSuggestion</key>
+	<date>2020-03-14T20:12:46Z</date>
+	<key>BackgroundUserBehaviorProcessor</key>
+	<date>2020-03-14T20:12:46Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
+	<date>2020-03-14T20:12:45Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
+	<date>2020-03-14T20:12:45Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
+	<date>2020-03-14T20:12:46Z</date>
+	<key>SiriPortraitDonation</key>
+	<date>2020-03-14T20:12:46Z</date>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/revgeoprovider.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>revgeoprovider</key>
+	<string>7618</string>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>LastContactClassificationKey</key>
+	<date>2020-03-14T20:13:04Z</date>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/clustererState.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PVClustererBringUpState</key>
+	<integer>30</integer>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/faceWorkerState.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IncrementalPersonProcessingStage</key>
+	<integer>6</integer>
+</dict>
+</plist>

tests/Test-RAW-10.15.1.photoslibrary/private/com.apple.photolibraryd/appPrivateData.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>PLLibraryServicesManager.LocaleIdentifier</key>
+	<string>en_US</string>
+</dict>
+</plist>