Fixed bug in --download-missing related to burst images

CHANGELOG.md

@@ -4,6 +4,14 @@ 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.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

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
 
@@ -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:

osxphotos/_version.py

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

osxphotos/photoinfo.py

@@ -663,6 +663,7 @@ class PhotoInfo:
                         edited=True,
                         live_photo=live_photo,
                         timeout=timeout,
+                        burst=self.burst,
                     )
             else:
                 # export original version and not edited
@@ -675,6 +676,7 @@ class PhotoInfo:
                     edited=False,
                     live_photo=live_photo,
                     timeout=timeout,
+                    burst=self.burst,
                 )
 
             if exported is not None:
@@ -882,6 +884,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 +930,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

@@ -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
@@ -332,6 +332,7 @@ def _export_photo_uuid_applescript(
                 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 +343,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 +390,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 +399,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}"

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",

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-14T06:33:01Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2020-03-07T16:11:53Z</date>
+	<date>2020-03-14T06:33:01Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2020-03-07T18:15:22Z</date>
+	<date>2020-03-14T06:33:01Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2020-03-07T16:11:53Z</date>
+	<date>2020-03-14T06:33:01Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2020-03-07T16:11:52Z</date>
+	<date>2020-03-14T06:33:01Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2020-03-07T08:11:00Z</date>
+	<date>2020-03-14T06:33:01Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
-	<date>2020-03-07T18:15:23Z</date>
+	<date>2020-03-14T06:33:02Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
-	<date>2020-03-07T08:10:59Z</date>
+	<date>2020-03-14T06:33:01Z</date>
 	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
-	<date>2020-03-07T18:15:22Z</date>
+	<date>2020-03-14T06:33:01Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2020-03-07T08:11:00Z</date>
+	<date>2020-03-14T06:33:01Z</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-14T06:33:02Z</date>
 	<key>LastContactClassificationKey</key>
-	<date>2020-03-07T08:11:02Z</date>
+	<date>2020-03-14T06:33:03Z</date>
 </dict>
 </plist>

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>IncrementalPersonProcessingStage</key>
-	<integer>0</integer>
+	<integer>6</integer>
 	<key>PersonBuilderLastMinimumFaceGroupSizeForCreatingMergeCandidates</key>
 	<integer>15</integer>
 	<key>PersonBuilderMergeCandidatesEnabled</key>