Feature add sequoia support (#1572)

* Initial support for Sequoia / Photos 10 * Fix test for linux * WTF * Fixed case sensitive names * Fixed case sensitive names * Updated readme
RhetTbull · Jun 12, 2024 · 9b87ec2 · 9b87ec2
1 parent 1daf76a
commit 9b87ec2
Show file tree

Hide file tree

Showing 296 changed files with 3,616 additions and 284 deletions.
diff --git a/README.md b/README.md
diff --git a/osxphotos/_constants.py b/osxphotos/_constants.py
@@ -53,6 +53,7 @@
 _PHOTOS_7_MODEL_VERSION = [15000, 15999]  # Dev preview: 15134, 12.1: 15331
 _PHOTOS_8_MODEL_VERSION = [16000, 16999]  # Ventura dev preview: 16119
 _PHOTOS_9_MODEL_VERSION = [17000, 17999]  # Sonoma dev preview: 17120
+_PHOTOS_10_MODEL_VERSION = [18000, 18999]  # Sequoia dev preview: 18164
 
 # the preview versions of 12.0.0 had a difference schema for syndication info so need to check model version before processing
 _PHOTOS_SYNDICATION_MODEL_VERSION = 15323  # 12.0.1
@@ -75,6 +76,8 @@
         "HDR_TYPE": "ZCUSTOMRENDEREDVALUE",
         "DETECTED_FACE_PERSON_FK": "ZDETECTEDFACE.ZPERSON",
         "DETECTED_FACE_ASSET_FK": "ZDETECTEDFACE.ZASSET",
+        "MASTER_FINGERPRINT": "ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT",
+        "HAS_ADJUSTMENTS": "ZGENERICASSET.ZHASADJUSTMENTS",
     },
     6: {
         "ASSET": "ZASSET",
@@ -89,6 +92,8 @@
         "HDR_TYPE": "ZCUSTOMRENDEREDVALUE",
         "DETECTED_FACE_PERSON_FK": "ZDETECTEDFACE.ZPERSON",
         "DETECTED_FACE_ASSET_FK": "ZDETECTEDFACE.ZASSET",
+        "MASTER_FINGERPRINT": "ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT",
+        "HAS_ADJUSTMENTS": "ZASSET.ZHASADJUSTMENTS",
     },
     7: {
         "ASSET": "ZASSET",
@@ -103,6 +108,8 @@
         "HDR_TYPE": "ZHDRTYPE",
         "DETECTED_FACE_PERSON_FK": "ZDETECTEDFACE.ZPERSON",
         "DETECTED_FACE_ASSET_FK": "ZDETECTEDFACE.ZASSET",
+        "MASTER_FINGERPRINT": "ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT",
+        "HAS_ADJUSTMENTS": "ZASSET.ZHASADJUSTMENTS",
     },
     8: {
         "ASSET": "ZASSET",
@@ -117,6 +124,8 @@
         "HDR_TYPE": "ZHDRTYPE",
         "DETECTED_FACE_PERSON_FK": "ZDETECTEDFACE.ZPERSON",
         "DETECTED_FACE_ASSET_FK": "ZDETECTEDFACE.ZASSET",
+        "MASTER_FINGERPRINT": "ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT",
+        "HAS_ADJUSTMENTS": "ZASSET.ZHASADJUSTMENTS",
     },
     9: {
         "ASSET": "ZASSET",
@@ -131,6 +140,24 @@
         "HDR_TYPE": "ZHDRTYPE",
         "DETECTED_FACE_PERSON_FK": "ZDETECTEDFACE.ZPERSONFORFACE",
         "DETECTED_FACE_ASSET_FK": "ZDETECTEDFACE.ZASSETFORFACE",
+        "MASTER_FINGERPRINT": "ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT",
+        "HAS_ADJUSTMENTS": "ZASSET.ZHASADJUSTMENTS",
+    },
+    10: {
+        "ASSET": "ZASSET",
+        "KEYWORD_JOIN": "Z_1KEYWORDS.Z_48KEYWORDS",
+        "ALBUM_JOIN": "Z_31ASSETS.Z_3ASSETS",
+        "ALBUM_SORT_ORDER": "Z_31ASSETS.Z_FOK_3ASSETS",
+        "IMPORT_FOK": "null",
+        "DEPTH_STATE": "ZASSET.ZDEPTHTYPE",
+        "UTI_ORIGINAL": "ZINTERNALRESOURCE.ZCOMPACTUTI",
+        "ASSET_ALBUM_JOIN": "Z_31ASSETS.Z_31ALBUMS",
+        "ASSET_ALBUM_TABLE": "Z_31ASSETS",
+        "HDR_TYPE": "ZHDRTYPE",
+        "DETECTED_FACE_PERSON_FK": "ZDETECTEDFACE.ZPERSONFORFACE",
+        "DETECTED_FACE_ASSET_FK": "ZDETECTEDFACE.ZASSETFORFACE",
+        "MASTER_FINGERPRINT": "ZADDITIONALASSETATTRIBUTES.ZORIGINALSTABLEHASH",
+        "HAS_ADJUSTMENTS": "ZASSET.ZADJUSTMENTSSTATE",
     },
 }
 

diff --git a/osxphotos/photosdb/photosdb.py b/osxphotos/photosdb/photosdb.py
@@ -1714,6 +1714,8 @@ def _process_database5(self):
         depth_state = _DB_TABLE_NAMES[photos_ver]["DEPTH_STATE"]
         uti_original_column = _DB_TABLE_NAMES[photos_ver]["UTI_ORIGINAL"]
         hdr_type_column = _DB_TABLE_NAMES[photos_ver]["HDR_TYPE"]
+        master_fingerprint = _DB_TABLE_NAMES[photos_ver]["MASTER_FINGERPRINT"]
+        has_adjustments = _DB_TABLE_NAMES[photos_ver]["HAS_ADJUSTMENTS"]
 
         # Look for all combinations of persons and pictures
         logger.debug(f"Getting information about persons")
@@ -1971,7 +1973,7 @@ def _process_database5(self):
         verbose("Processing photo details.")
         c.execute(
             f"""SELECT {asset_table}.ZUUID,
-                ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT,
+                {master_fingerprint},
                 ZADDITIONALASSETATTRIBUTES.ZTITLE,
                 ZADDITIONALASSETATTRIBUTES.ZORIGINALFILENAME,
                 {asset_table}.ZMODIFICATIONDATE,
@@ -1985,7 +1987,7 @@ def _process_database5(self):
                 {asset_table}.ZFILENAME,
                 {asset_table}.ZLATITUDE,
                 {asset_table}.ZLONGITUDE,
-                {asset_table}.ZHASADJUSTMENTS,
+                {has_adjustments},
                 {asset_table}.ZCLOUDBATCHPUBLISHDATE,
                 {asset_table}.ZKIND,
                 {asset_table}.ZUNIFORMTYPEIDENTIFIER,
@@ -2354,7 +2356,7 @@ def _process_database5(self):
         # get information about adjusted/edited photos
         c.execute(
             f"""SELECT {asset_table}.ZUUID,
-                {asset_table}.ZHASADJUSTMENTS,
+                {has_adjustments},
                 ZUNMANAGEDADJUSTMENT.ZADJUSTMENTFORMATIDENTIFIER
                 FROM {asset_table}, ZUNMANAGEDADJUSTMENT
                 JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = {asset_table}.Z_PK
@@ -2432,7 +2434,7 @@ def _process_database5(self):
                 ZINTERNALRESOURCE.ZREMOTEAVAILABILITY
                 FROM {asset_table}
                 JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = {asset_table}.Z_PK
-                JOIN ZINTERNALRESOURCE ON ZINTERNALRESOURCE.ZFINGERPRINT = ZADDITIONALASSETATTRIBUTES.ZMASTERFINGERPRINT """
+                JOIN ZINTERNALRESOURCE ON ZINTERNALRESOURCE.ZFINGERPRINT = {master_fingerprint} """
         )
 
         for row in c:

diff --git a/osxphotos/photosdb/photosdb_utils.py b/osxphotos/photosdb/photosdb_utils.py
@@ -17,6 +17,7 @@
     _PHOTOS_7_MODEL_VERSION,
     _PHOTOS_8_MODEL_VERSION,
     _PHOTOS_9_MODEL_VERSION,
+    _PHOTOS_10_MODEL_VERSION,
     _TESTED_DB_VERSIONS,
 )
 from ..sqlite_utils import sqlite_open_ro
@@ -135,10 +136,12 @@ def get_photos_version_from_model(db_file: str) -> int:
         return 8
     if _PHOTOS_9_MODEL_VERSION[0] <= model_ver <= _PHOTOS_9_MODEL_VERSION[1]:
         return 9
+    if _PHOTOS_10_MODEL_VERSION[0] <= model_ver <= _PHOTOS_10_MODEL_VERSION[1]:
+        return 10
     logger.warning(
         f"Unknown db / model version for {db_file}: model_ver={model_ver}; assuming latest version"
     )
-    return 9
+    return 10
 
 
 def get_photos_library_version(library_path: str | pathlib.Path) -> int:

diff --git a/tests/Test-14.0.0.photoslibrary/database/Photos.sqlite b/tests/Test-14.0.0.photoslibrary/database/Photos.sqlite
diff --git a/tests/Test-14.0.0.photoslibrary/database/Photos.sqlite-shm b/tests/Test-14.0.0.photoslibrary/database/Photos.sqlite-shm
diff --git a/tests/Test-14.0.0.photoslibrary/database/Photos.sqlite-wal b/tests/Test-14.0.0.photoslibrary/database/Photos.sqlite-wal
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/DataModelVersion.plist b/tests/Test-15.0.0_Dev_Preview.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>
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/Photos.sqlite b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/Photos.sqlite
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/Photos.sqlite-shm b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/Photos.sqlite-shm
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/Photos.sqlite-wal b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/Photos.sqlite-wal
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/Photos.sqlite.lock b/tests/Test-15.0.0_Dev_Preview.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>Turals-Macbook-Pro.local</string>
+	<key>hostuuid</key>
+	<string>5E17AD36-A1D3-512D-ADB3-179E948B2295</string>
+	<key>pid</key>
+	<integer>1128</integer>
+	<key>processname</key>
+	<string>photolibraryd</string>
+	<key>uid</key>
+	<integer>501</integer>
+</dict>
+</plist>
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/metaSchema.db b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/metaSchema.db
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/photos.db b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/photos.db
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/protection b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/protection
diff --git a/...potlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/.store.db b/...potlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/.store.db
diff --git a/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.directoryStoreFile b/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.directoryStoreFile
diff --git a/...tectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.directoryStoreFile.shadow b/...tectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.directoryStoreFile.shadow
diff --git a/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexArrays b/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexArrays
diff --git a/...ht/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexBigDates b/...ht/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexBigDates
diff --git a/...eProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexCompactDirectory b/...eProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexCompactDirectory
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexDirectory b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexDirectory
diff --git a/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexGroups b/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexGroups
diff --git a/...tlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexHead b/...tlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexHead
diff --git a/...otlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexIds b/...otlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexIds
diff --git a/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexPositionTable b/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexPositionTable
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexPositions b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexPositions
diff --git a/...ht/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexPostings b/...ht/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexPostings
diff --git a/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexScores b/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexScores
diff --git a/...ght/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexTermIds b/...ght/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexTermIds
diff --git a/...ght/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexUpdates b/...ght/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.indexUpdates
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.shadowIndexGroups b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.shadowIndexGroups
diff --git a/.../NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.shadowIndexHead b/.../NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/0.shadowIndexHead
diff --git a/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/clientstatesmetafile b/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/clientstatesmetafile
@@ -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>journalSerialNumber</key>
+	<integer>1</integer>
+	<key>version</key>
+	<integer>1</integer>
+</dict>
+</plist>
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.buckets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.buckets
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.data b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.data
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.header b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.header
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.header.shadow b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.header.shadow
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.offsets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-1.map.offsets
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.buckets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.buckets
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.data b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.data
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.header b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.header
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.header.shadow b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.header.shadow
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.offsets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-2.map.offsets
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.buckets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.buckets
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.data b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.data
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.header b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.header
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.header.shadow b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.header.shadow
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.offsets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-3.map.offsets
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.buckets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.buckets
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.data b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.data
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.header b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.header
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.header.shadow b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.header.shadow
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.offsets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-4.map.offsets
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.buckets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.buckets
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.data b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.data
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.header b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.header
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.header.shadow b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.header.shadow
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.offsets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-5.map.offsets
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.buckets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.buckets
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.data b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.data
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.header b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.header
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.header.shadow b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.header.shadow
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.offsets b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/dbStr-6.map.offsets
diff --git a/...tectionCompleteUntilFirstUserAuthentication/index.spotlightV3/hot.1718062498671010.Pe74sW b/...tectionCompleteUntilFirstUserAuthentication/index.spotlightV3/hot.1718062498671010.Pe74sW
diff --git a/...otlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/indexState b/...otlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/indexState
diff --git a/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/journalAttr.1 b/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/journalAttr.1
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.directoryStoreFile b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.directoryStoreFile
diff --git a/...onCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.directoryStoreFile.shadow b/...onCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.directoryStoreFile.shadow
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexArrays b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexArrays
diff --git a/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexBigDates b/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexBigDates
diff --git a/...ectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexCompactDirectory b/...ectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexCompactDirectory
diff --git a/...ileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexDirectory b/...ileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexDirectory
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexGroups b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexGroups
diff --git a/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexHead b/...t/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexHead
diff --git a/...ht/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexIds b/...ht/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexIds
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexPositionTable b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexPositionTable
diff --git a/...ileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexPositions b/...ileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexPositions
diff --git a/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexPostings b/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexPostings
diff --git a/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexScores b/...NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexScores
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexTermIds b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexTermIds
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexUpdates b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.indexUpdates
diff --git a/...ProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexArrays b/...ProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexArrays
diff --git a/...CompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexCompactDirectory b/...CompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexCompactDirectory
diff --git a/...tectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexDirectory b/...tectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexDirectory
diff --git a/...ProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexGroups b/...ProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexGroups
diff --git a/...leProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexHead b/...leProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexHead
diff --git a/...ionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexPositionTable b/...ionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexPositionTable
diff --git a/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexTermIds b/...rotectionCompleteUntilFirstUserAuthentication/index.spotlightV3/live.0.shadowIndexTermIds
diff --git a/...ileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/reverseDirectoryStore b/...ileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/reverseDirectoryStore
diff --git a/...ectionCompleteUntilFirstUserAuthentication/index.spotlightV3/reverseDirectoryStore.shadow b/...ectionCompleteUntilFirstUserAuthentication/index.spotlightV3/reverseDirectoryStore.shadow
diff --git a/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/reverseStore.updates b/...FileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/reverseStore.updates
diff --git a/...Spotlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/store.db b/...Spotlight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/store.db
diff --git a/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/store.updates b/...ight/NSFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/store.updates
diff --git a/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/tmp.spotlight.state b/...SFileProtectionCompleteUntilFirstUserAuthentication/index.spotlightV3/tmp.spotlight.state
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/Spotlight/heartbeat.plist b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/Spotlight/heartbeat.plist
@@ -0,0 +1,68 @@
+<?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>build</key>
+	<string>24A5264n</string>
+	<key>heartbeat_age</key>
+	<integer>1718062498</integer>
+	<key>lastSent</key>
+	<integer>-1</integer>
+	<key>parentDirectory_age</key>
+	<integer>1718062498</integer>
+	<key>pcA_age</key>
+	<integer>-1</integer>
+	<key>pcA_obj_count</key>
+	<integer>-1</integer>
+	<key>pcA_wipes</key>
+	<integer>0</integer>
+	<key>pcA_wipes_aggregate</key>
+	<integer>0</integer>
+	<key>pcB_age</key>
+	<integer>-1</integer>
+	<key>pcB_obj_count</key>
+	<integer>-1</integer>
+	<key>pcB_wipes</key>
+	<integer>0</integer>
+	<key>pcB_wipes_aggregate</key>
+	<integer>0</integer>
+	<key>pcCX_age</key>
+	<integer>-1</integer>
+	<key>pcCX_obj_count</key>
+	<integer>-1</integer>
+	<key>pcCX_wipes</key>
+	<integer>0</integer>
+	<key>pcCX_wipes_aggregate</key>
+	<integer>0</integer>
+	<key>pcC_age</key>
+	<integer>1718062498</integer>
+	<key>pcC_obj_count</key>
+	<integer>1</integer>
+	<key>pcC_wipes</key>
+	<integer>0</integer>
+	<key>pcC_wipes_aggregate</key>
+	<integer>0</integer>
+	<key>pcPriority_age</key>
+	<integer>-1</integer>
+	<key>pcPriority_obj_count</key>
+	<integer>-1</integer>
+	<key>pcPriority_wipes</key>
+	<integer>0</integer>
+	<key>pcPriority_wipes_aggregate</key>
+	<integer>0</integer>
+	<key>previousbuild</key>
+	<string>unknown</string>
+	<key>previousspotlightversion</key>
+	<string>unknown</string>
+	<key>rootsinstalled</key>
+	<false/>
+	<key>spotlightversion</key>
+	<string>2305.1.5</string>
+	<key>timesinceboot</key>
+	<integer>1718056899</integer>
+	<key>timesinceupdate</key>
+	<integer>-1</integer>
+	<key>vectorindexon</key>
+	<false/>
+</dict>
+</plist>
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/Spotlight/indexOpenRecord.plist b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/Spotlight/indexOpenRecord.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>pcA_lastAnalytics</key>
+	<integer>-1</integer>
+	<key>pcA_lastOpen</key>
+	<integer>-1</integer>
+	<key>pcB_lastAnalytics</key>
+	<integer>-1</integer>
+	<key>pcB_lastOpen</key>
+	<integer>-1</integer>
+	<key>pcCX_lastAnalytics</key>
+	<integer>-1</integer>
+	<key>pcCX_lastOpen</key>
+	<integer>-1</integer>
+	<key>pcC_lastAnalytics</key>
+	<integer>-1</integer>
+	<key>pcC_lastOpen</key>
+	<integer>1718062498</integer>
+	<key>pcPriority_lastAnalytics</key>
+	<integer>-1</integer>
+	<key>pcPriority_lastOpen</key>
+	<integer>-1</integer>
+</dict>
+</plist>
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/graphDataProgress.plist b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/graphDataProgress.plist
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/psi.sqlite b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/psi.sqlite
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/psi.sqlite-shm b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/psi.sqlite-shm
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/psi.sqlite-wal b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/psi.sqlite-wal
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/searchMetadata.plist b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/searchMetadata.plist
@@ -0,0 +1,19 @@
+<?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>SceneWhitelist</key>
+	<array>
+		<string>Art</string>
+		<string>Flower</string>
+		<string>Food</string>
+		<string>Jewelry</string>
+		<string>Lake</string>
+		<string>Shore</string>
+		<string>Sport</string>
+		<string>Vehicle</string>
+	</array>
+</dict>
+</plist>
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/searchProgress.plist b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/searchProgress.plist
@@ -0,0 +1,28 @@
+<?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/>
+	<key>renamePerson</key>
+	<array/>
+</dict>
+</plist>
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/searchSystemInfo.plist b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/searchSystemInfo.plist
@@ -0,0 +1,18 @@
+<?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>featureFlags</key>
+	<string>319</string>
+	<key>featuredContentAllowed</key>
+	<string>1</string>
+	<key>localeIdentifier</key>
+	<string>en_US</string>
+	<key>sceneTaxonomySHA</key>
+	<string>64d078bafc0035e1ec26dfa565c2ac0479fcbab329fda1c16cd17e0fdbf2f4c0,4afa5d3c45c08a664cf73cff957aaeeae3a325d2970aada51268407b9ad0f03e</string>
+	<key>searchIndexVersion</key>
+	<string>16025</string>
+</dict>
+</plist>
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/synonymsProcess.plist b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/synonymsProcess.plist
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/zeroKeywords.data b/tests/Test-15.0.0_Dev_Preview.photoslibrary/database/search/zeroKeywords.data
diff --git a/...Dev_Preview.photoslibrary/originals/1/1EB2B765-0765-43BA-A90C-0D0580E6172C.jpeg b/...Dev_Preview.photoslibrary/originals/1/1EB2B765-0765-43BA-A90C-0D0580E6172C.jpeg
diff --git a/...Dev_Preview.photoslibrary/originals/3/3DD2C897-F19E-4CA6-8C22-B027D5A71907.jpeg b/...Dev_Preview.photoslibrary/originals/3/3DD2C897-F19E-4CA6-8C22-B027D5A71907.jpeg
diff --git a/...Dev_Preview.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96.jpeg b/...Dev_Preview.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96.jpeg
diff --git a/...t-15.0.0_Dev_Preview.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96_4.cr2 b/...t-15.0.0_Dev_Preview.photoslibrary/originals/4/4D521201-92AC-43E5-8F7C-59BC41C37A96_4.cr2
diff --git a/...Dev_Preview.photoslibrary/originals/6/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.jpeg b/...Dev_Preview.photoslibrary/originals/6/6191423D-8DB8-4D4C-92BE-9BBBA308AAC4.jpeg
diff --git a/...Dev_Preview.photoslibrary/originals/6/6FD38366-3BF2-407D-81FE-7153EB6125B6.jpeg b/...Dev_Preview.photoslibrary/originals/6/6FD38366-3BF2-407D-81FE-7153EB6125B6.jpeg
diff --git a/...Dev_Preview.photoslibrary/originals/7/71E3E212-00EB-430D-8A63-5E294B268554.jpeg b/...Dev_Preview.photoslibrary/originals/7/71E3E212-00EB-430D-8A63-5E294B268554.jpeg
diff --git a/...st-15.0.0_Dev_Preview.photoslibrary/originals/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.heic b/...st-15.0.0_Dev_Preview.photoslibrary/originals/7/7783E8E6-9CAC-40F3-BE22-81FB7051C266.heic
diff --git a/...st-15.0.0_Dev_Preview.photoslibrary/originals/8/8846E3E6-8AC8-4857-8448-E3D025784410.tiff b/...st-15.0.0_Dev_Preview.photoslibrary/originals/8/8846E3E6-8AC8-4857-8448-E3D025784410.tiff
diff --git a/...Dev_Preview.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91.jpeg b/...Dev_Preview.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91.jpeg
diff --git a/...t-15.0.0_Dev_Preview.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91_4.cr2 b/...t-15.0.0_Dev_Preview.photoslibrary/originals/A/A92D9C26-3A50-4197-9388-CB5F7DB9FA91_4.cr2
diff --git a/...est-15.0.0_Dev_Preview.photoslibrary/originals/D/D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068.dng b/...est-15.0.0_Dev_Preview.photoslibrary/originals/D/D05A5FE3-15FB-49A1-A15D-AB3DA6F8B068.dng
diff --git a/...Dev_Preview.photoslibrary/originals/D/D79B8D77-BFFC-460B-9312-034F2877D35B.jpeg b/...Dev_Preview.photoslibrary/originals/D/D79B8D77-BFFC-460B-9312-034F2877D35B.jpeg
diff --git a/...Dev_Preview.photoslibrary/originals/D/DC99FBDD-7A52-4100-A5BB-344131646C30.jpeg b/...Dev_Preview.photoslibrary/originals/D/DC99FBDD-7A52-4100-A5BB-344131646C30.jpeg
diff --git a/...Dev_Preview.photoslibrary/originals/E/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.jpeg b/...Dev_Preview.photoslibrary/originals/E/E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51.jpeg
diff --git a/...Dev_Preview.photoslibrary/originals/F/F12384F6-CD17-4151-ACBA-AE0E3688539E.jpeg b/...Dev_Preview.photoslibrary/originals/F/F12384F6-CD17-4151-ACBA-AE0E3688539E.jpeg
diff --git a/tests/Test-15.0.0_Dev_Preview.photoslibrary/private/.metadata_never_index b/tests/Test-15.0.0_Dev_Preview.photoslibrary/private/.metadata_never_index
diff --git a/...-15.0.0_Dev_Preview.photoslibrary/private/com.apple.Photos.Migration/appPrivateData.plist b/...-15.0.0_Dev_Preview.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>