Added TODOs

.github/workflows/pythonpackage.yml

@@ -0,0 +1,34 @@
+name: Python package
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: macOS-10.14
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.6, 3.7]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v1
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Lint with flake8
+      run: |
+       # pip install flake8
+        # stop the build if there are Python syntax errors or undefined names
+       # flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+       # flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pip install pytest
+        python -m pytest tests/

README.md

@@ -11,7 +11,10 @@ OSXPhotos provides the ability to interact with and query Apple's Photos app lib
 
 Only works on Mac OS X. Tested on Mac OS 10.12.6 / Photos 2.0, 10.13.6 / Photos 3.0 and Mac OS 10.14.5, 10.14.6 / Photos 4.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 Mac OS 10.4 on a machine running Mac OS 10.12
+NOTE: Alpha support for Mac OS 10.15.0 / Photos 5.0.  Photos 5.0 uses a new database format which required rewrite of much of the code for this package.  If you find bugs, please open an [issue](https://github.com/RhetTbull/osxphotos/issues/).
+
+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 Mac OS 10.14 on a machine running Mac OS 10.12
+
 
 ## Installation instructions
 
@@ -25,7 +28,7 @@ This module will install a command line utility called `osxphotos` that allows y
 
 If you only care about the command line tool, I recommend installing with [pipx](https://github.com/pipxproject/pipx)
 
-After install pipx:
+After installing pipx:
 `pipx install osxphotos`
 
 ```
@@ -53,15 +56,30 @@ Example: `osxphotos help query`
 ```
 Usage: osxphotos help [OPTIONS]
 
-  query the Photos database using 1 or more search options
+  Query the Photos database using 1 or more search options
+
+  If more than one option is provided, they are treated as "AND"  (e.g.
+  search for photos matching all options)
 
 Options:
-  --keyword TEXT  search for keyword(s)
+  --keyword TEXT      search for keyword(s)
-  --person TEXT   search for person(s)
+  --person TEXT       search for person(s)
-  --album TEXT    search for album(s)
+  --album TEXT        search for album(s)
-  --uuid TEXT     search for UUID(s)
+  --uuid TEXT         search for UUID(s)
-  --json          Print output in JSON format
+  --name TEXT         search for TEXT in name of photo
-  -h, --help      Show this message and exit. 
+  --no-name           search for photos with no name
+  --description TEXT  search for TEXT in description of photo
+  --no-description    search for photos with no description
+  -i, --ignore-case   case insensitive search for name or description. Does
+                      not apply to keyword, person, or album
+  --favorite          search for photos marked favorite
+  --not-favorite      search for photos not marked favorite
+  --hidden            search for photos marked hidden
+  --not-hidden        search for photos not marked hidden
+  --missing           search for photos missing from disk
+  --not-missing       search for photos present on disk (e.g. not missing)
+  --json              Print output in JSON format
+  -h, --help          Show this message and exit.
 ```
 
 Example: find all photos with keyword "Kids" and output results to json file named results.json:
@@ -93,6 +111,7 @@ def main():
         print(
             p.uuid,
             p.filename(),
+            p.original_filename(),
             p.date(),
             p.description(),
             p.name(),
@@ -283,7 +302,10 @@ PhotosDB.photos() returns a list of PhotoInfo objects.  Each PhotoInfo object re
 Returns the universally unique identifier (uuid) of the photo.  This is how Photos keeps track of individual photos within the database.
 
 #### `filename()`
-Returns the filename of the photo
+Returns the current filename of the photo on disk.  See also `original_filename()`
+
+#### `original_filename()`
+Returns the original filename of the photo when it was imported to Photos.  Note: Photos 5.0+ renames the photo when it adds the file to the library using UUID.  See also `filename()`
 
 #### `date()`
 Returns the date of the photo as a datetime.datetime object
@@ -304,7 +326,7 @@ Returns a list of albums the photo is contained in
 Returns a list of the names of the persons in the photo
 
 #### `path()`
-Returns the path to the photo on disk as a string.  Note: this returns the path to the *original* unedited file (see `hasadjustments()`).  If the file is missing on disk, path=`None` (see `ismissing()`)
+Returns the absolute path to the photo on disk as a string.  Note: this returns the path to the *original* unedited file (see `hasadjustments()`).  If the file is missing on disk, path=`None` (see `ismissing()`)
 
 #### `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. Note: this status is set by Photos and osxphotos does not verify that the file path returned by `path()` actually exists.  It merely reports what Photos has stored in the library database. 
@@ -312,6 +334,12 @@ Returns `True` if the original image file is missing on disk, otherwise `False`.
 #### `hasadjustments()`
 Returns `True` if the file has been edited in Photos, otherwise `False`
 
+#### `favorite()`
+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`
+
 #### `to_json()`
 Returns a JSON representation of all photo info 
 
@@ -324,6 +352,7 @@ for p in photos:
     print(
         p.uuid(),
         p.filename(),
+        p.original_filename(),
         p.date(),
         p.description(),
         p.name(),

osxphotos/cmd_line.py

@@ -7,6 +7,9 @@ import yaml
 
 import osxphotos
 
+# TODO: add query for description, name (contains text)
+# TODO: add "--any" to search any field (e.g. keyword, description, name contains "wedding") (add case insensitive option)
+
 
 class CLI_Obj:
     def __init__(self, db=None, json=False):
@@ -91,6 +94,15 @@ def info(cli_obj):
     info["albums"] = albums
 
     persons = pdb.persons_as_dict()
+    # handle empty person names (added by Photos 5.0+ when face detected but not identified)
+    noperson = "UNKNOWN"
+    if "" in persons:
+        if noperson in persons:
+            persons[noperson].append(persons[""])
+        else:
+            persons[noperson] = persons[""]
+        persons.pop("", None)
+
     info["persons_count"] = len(persons)
     info["persons"] = persons
 
@@ -114,6 +126,35 @@ def dump(cli_obj):
 @click.option("--person", default=None, multiple=True, help="search for person(s)")
 @click.option("--album", default=None, multiple=True, help="search for album(s)")
 @click.option("--uuid", default=None, multiple=True, help="search for UUID(s)")
+@click.option(
+    "--name", default=None, multiple=True, help="search for TEXT in name of photo"
+)
+@click.option("--no-name", is_flag=True, help="search for photos with no name")
+@click.option(
+    "--description",
+    default=None,
+    multiple=True,
+    help="search for TEXT in description of photo",
+)
+@click.option("--no-description", is_flag=True, help="search for photos with no description")
+@click.option(
+    "-i",
+    "--ignore-case",
+    is_flag=True,
+    help="case insensitive search for name or description. Does not apply to keyword, person, or album",
+)
+@click.option("--favorite", is_flag=True, help="search for photos marked favorite")
+@click.option(
+    "--not-favorite", is_flag=True, help="search for photos not marked favorite"
+)
+@click.option("--hidden", is_flag=True, help="search for photos marked hidden")
+@click.option("--not-hidden", is_flag=True, help="search for photos not marked hidden")
+@click.option("--missing", is_flag=True, help="search for photos missing from disk")
+@click.option(
+    "--not-missing",
+    is_flag=True,
+    help="search for photos present on disk (e.g. not missing)",
+)
 @click.option(
     "--json",
     required=False,
@@ -123,17 +164,124 @@ def dump(cli_obj):
 )
 @click.pass_obj
 @click.pass_context
-def query(ctx, cli_obj, keyword, person, album, uuid, json):
+def query(
-    """ query the Photos database using 1 or more search options """
+    ctx,
+    cli_obj,
+    keyword,
+    person,
+    album,
+    uuid,
+    name,
+    no_name,
+    description,
+    no_description,
+    ignore_case,
+    json,
+    favorite,
+    not_favorite,
+    hidden,
+    not_hidden,
+    missing,
+    not_missing,
+):
+    """ Query the Photos database using 1 or more search options\n
+        If more than one option is provided, they are treated as "AND" 
+        (e.g. search for photos matching all options)
+    """
 
     # if no query terms, show help and return
-    if not keyword and not person and not album and not uuid:
+    if (
+        not keyword
+        and not person
+        and not album
+        and not uuid
+        and not name
+        and not no_name
+        and not description
+        and not no_description
+        and not favorite
+        and not not_favorite
+        and not hidden
+        and not not_hidden
+        and not missing
+        and not not_missing
+    ):
         print(cli.commands["query"].get_help(ctx))
         return
+    elif favorite and not_favorite:
+        # can't search for both favorite and notfavorite
+        print(cli.commands["query"].get_help(ctx))
+        return
+    elif hidden and not_hidden:
+        # can't search for both hidden and nothidden
+        print(cli.commands["query"].get_help(ctx))
+        return
+    elif missing and not_missing:
+        # can't search for both missing and notmissing
+        print(cli.commands["query"].get_help(ctx))
+        return
+    elif name and no_name:
+        # can't search for both name and no_name
+        print(cli.commands["query"].get_help(ctx))
+        return 
+    elif description and no_description:
+        # can't search for both description and no_description
+        print(cli.commands["query"].get_help(ctx))
+        return 
     else:
         photos = cli_obj.photosdb.photos(
             keywords=keyword, persons=person, albums=album, uuid=uuid
         )
+
+        if name:
+            # search name field for text
+            # if more than one, find photos with all name values in in name
+            if ignore_case:
+                # case-insensitive
+                for n in name:
+                    n = n.lower()
+                    photos = [p for p in photos if p.name() and n in p.name().lower()]
+            else:
+                for n in name:
+                    photos = [p for p in photos if p.name() and n in p.name()]
+        elif no_name:
+            photos = [p for p in photos if not p.name()]
+
+        if description:
+            # search description field for text
+            # if more than one, find photos with all name values in in description
+            if ignore_case:
+                # case-insensitive
+                for d in description:
+                    d = d.lower()
+                    photos = [
+                        p
+                        for p in photos
+                        if p.description() and d in p.description().lower()
+                    ]
+            else:
+                for d in description:
+                    photos = [
+                        p for p in photos if p.description() and d in p.description()
+                    ]
+        elif no_description:
+            photos = [p for p in photos if not p.description()]
+
+        if favorite:
+            photos = [p for p in photos if p.favorite()]
+        elif not_favorite:
+            photos = [p for p in photos if not p.favorite()]
+
+        if hidden:
+            photos = [p for p in photos if p.hidden()]
+        elif not_hidden:
+            photos = [p for p in photos if not p.hidden()]
+
+        if missing:
+            photos = [p for p in photos if p.ismissing()]
+        elif not_missing:
+            photos = [p for p in photos if not p.ismissing()]
+
         print_photo_info(photos, cli_obj.json or json)
 
 
@@ -165,6 +313,7 @@ def print_photo_info(photos, json=False):
             [
                 "uuid",
                 "filename",
+                "original_filename",
                 "date",
                 "description",
                 "name",
@@ -174,6 +323,8 @@ def print_photo_info(photos, json=False):
                 "path",
                 "ismissing",
                 "hasadjustments",
+                "favorite",
+                "hidden",
             ]
         )
         for p in photos:
@@ -181,6 +332,7 @@ def print_photo_info(photos, json=False):
                 [
                     p.uuid(),
                     p.filename(),
+                    p.original_filename(),
                     str(p.date()),
                     p.description(),
                     p.name(),
@@ -190,6 +342,8 @@ def print_photo_info(photos, json=False):
                     p.path(),
                     p.ismissing(),
                     p.hasadjustments(),
+                    p.favorite(),
+                    p.hidden(),
                 ]
             )
         for row in dump:

setup.py

@@ -38,7 +38,7 @@ with open(path.join(this_directory, "README.md"), encoding="utf-8") as f:
 
 setup(
     name="osxphotos",
-    version="0.12.2",
+    version="0.14.4",
     description="Manipulate (read-only) Apple's Photos app library on Mac OS X",
     long_description=long_description,
     long_description_content_type="text/markdown",

tests/Test-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-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>1368</integer>
+	<key>processname</key>
+	<string>photolibraryd</string>
+	<key>uid</key>
+	<integer>501</integer>
+</dict>
+</plist>

tests/Test-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-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-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-10.15.1.photoslibrary/private/com.apple.Photos.Migration/appPrivateData.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>MigrationService</key>
+	<dict>
+		<key>State</key>
+		<integer>4</integer>
+	</dict>
+	<key>MigrationService.LastCompletedTask</key>
+	<integer>12</integer>
+	<key>MigrationService.ValidationCounts</key>
+	<dict>
+		<key>MigrationDetectedFaceprint</key>
+		<integer>6</integer>
+		<key>MigrationManagedAsset</key>
+		<integer>0</integer>
+		<key>MigrationSceneClassification</key>
+		<integer>44</integer>
+		<key>MigrationUnmanagedAdjustment</key>
+		<integer>0</integer>
+		<key>RDVersion.cloudLocalState.CPLIsNotPushed</key>
+		<integer>7</integer>
+	</dict>
+</dict>
+</plist>

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

@@ -0,0 +1,45 @@
+<?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/>
+	<key>Photos</key>
+	<dict>
+		<key>CollapsedSidebarSectionIdentifiers</key>
+		<array/>
+		<key>ExpandedSidebarItemIdentifiers</key>
+		<array>
+			<string>TopLevelAlbums</string>
+			<string>TopLevelSlideshows</string>
+		</array>
+		<key>IPXWorkspaceControllerZoomLevelsKey</key>
+		<dict>
+			<key>kZoomLevelIdentifierAlbums</key>
+			<integer>7</integer>
+			<key>kZoomLevelIdentifierVersions</key>
+			<integer>7</integer>
+		</dict>
+		<key>lastAddToDestination</key>
+		<dict>
+			<key>key</key>
+			<integer>1</integer>
+			<key>lastKnownDisplayName</key>
+			<string>September 28, 2018</string>
+			<key>type</key>
+			<string>album</string>
+			<key>uuid</key>
+			<string>DFFKmHt3Tk+AGzZLe2Xq+g</string>
+		</dict>
+		<key>lastKnownItemCounts</key>
+		<dict>
+			<key>other</key>
+			<integer>0</integer>
+			<key>photos</key>
+			<integer>7</integer>
+			<key>videos</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+</dict>
+</plist>

tests/Test-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>2019-11-13T03:46:27Z</date>
+	<key>BackgroundHighlightEnrichment</key>
+	<date>2019-11-13T03:46:27Z</date>
+	<key>BackgroundJobAssetRevGeocode</key>
+	<date>2019-11-13T03:46:27Z</date>
+	<key>BackgroundJobSearch</key>
+	<date>2019-11-13T03:46:27Z</date>
+	<key>BackgroundPeopleSuggestion</key>
+	<date>2019-11-13T03:46:27Z</date>
+	<key>BackgroundUserBehaviorProcessor</key>
+	<date>2019-11-13T03:46:28Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
+	<date>2019-11-13T03:46:28Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
+	<date>2019-11-13T03:46:27Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
+	<date>2019-11-13T03:46:28Z</date>
+	<key>SiriPortraitDonation</key>
+	<date>2019-11-13T03:46:28Z</date>
+</dict>
+</plist>

tests/Test-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-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PersonPromoter

@@ -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>NumberOfFacesProcessedOnLastRun</key>
+	<integer>7</integer>
+	<key>ProcessedInQuiescentState</key>
+	<true/>
+	<key>SuggestedMeIdentifier</key>
+	<string></string>
+	<key>Version</key>
+	<integer>4</integer>
+</dict>
+</plist>

tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/vision/PhotoAnalysisServicePreferences.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>FaceIDModelLastGenerationKey</key>
+	<date>2019-11-13T03:46:28Z</date>
+	<key>LastContactClassificationKey</key>
+	<date>2019-11-13T03:46:29Z</date>
+</dict>
+</plist>

tests/Test-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>50</integer>
+</dict>
+</plist>

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

@@ -0,0 +1,12 @@
+<?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>
+	<key>PersonBuilderLastMinimumFaceGroupSizeForCreatingMergeCandidates</key>
+	<integer>15</integer>
+	<key>PersonBuilderMergeCandidatesEnabled</key>
+	<true/>
+</dict>
+</plist>

tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/graph/PhotoAnalysisServicePreferences.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>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
+	<date>2019-08-07T02:26:15Z</date>
+	<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
+	<date>2019-08-17T14:26:34Z</date>
+</dict>
+</plist>