Added external_edit for Photos 5

osxphotos/__init__.py

@@ -580,6 +580,7 @@ class PhotosDB:
             self._dbphotos[uuid]["latitude"] = row[18]
             self._dbphotos[uuid]["longitude"] = row[19]
             self._dbphotos[uuid]["adjustmentUuid"] = row[20]
+            self._dbphotos[uuid]["adjustmentFormatID"] = None
 
         # get details needed to find path of the edited photos and live photos
         c.execute(
@@ -598,8 +599,8 @@ class PhotosDB:
         # 3     RKModelResource.resourceTag
         # 4     RKModelResource.UTI
         # 5     RKVersion.specialType
-        # 7     RKModelResource.attachedModelType
+        # 6     RKModelResource.attachedModelType
-        # 8     RKModelResource.resourceType
+        # 7     RKModelResource.resourceType
 
         # TODO: add live photos
         # attachedmodeltype is 2, it's a photo, could be more than one
@@ -619,7 +620,7 @@ class PhotosDB:
                         if "edit_resource_id" in self._dbphotos[uuid]:
                             logging.warning(
                                 f"WARNING: found more than one edit_resource_id for "
-                                f"UUID {row[0]},adjustmentID {row[1]}, modelID {row[2]}"
+                                f"UUID {row[0]},adjustmentUUID {row[1]}, modelID {row[2]}"
                             )
                         # TODO: I think there should never be more than one edit but
                         # I've seen this once in my library
@@ -892,6 +893,8 @@ class PhotosDB:
             self._dbphotos[uuid]["localAvailability"] = None
             self._dbphotos[uuid]["remoteAvailability"] = None
             self._dbphotos[uuid]["isMissing"] = None
+            self._dbphotos[uuid]["adjustmentUuid"] = None
+            self._dbphotos[uuid]["adjustmentFormatID"] = None
 
         # Get extended description
         c.execute(
@@ -915,7 +918,9 @@ class PhotosDB:
 
         # get information about adjusted/edited photos
         c.execute(
-            "SELECT ZGENERICASSET.ZUUID, ZGENERICASSET.ZHASADJUSTMENTS, ZUNMANAGEDADJUSTMENT.ZADJUSTMENTFORMATIDENTIFIER "
+            "SELECT ZGENERICASSET.ZUUID, "
+            "ZGENERICASSET.ZHASADJUSTMENTS, "
+            "ZUNMANAGEDADJUSTMENT.ZADJUSTMENTFORMATIDENTIFIER "
             "FROM ZGENERICASSET, ZUNMANAGEDADJUSTMENT "
             "JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK "
             "WHERE ZADDITIONALASSETATTRIBUTES.ZUNMANAGEDADJUSTMENT = ZUNMANAGEDADJUSTMENT.Z_PK "
@@ -924,7 +929,7 @@ class PhotosDB:
         for row in c:
             uuid = row[0]
             if uuid in self._dbphotos:
-                self._dbphotos[uuid]["adjustmentID"] = row[2]
+                self._dbphotos[uuid]["adjustmentFormatID"] = row[2]
             else:
                 logging.debug(
                     f"WARNING: found adjustmentformatidentifier {row[2]} but no photo for uuid {row[0]}"
@@ -1241,9 +1246,17 @@ class PhotoInfo:
         return True if self.__info["isMissing"] == 1 else False
 
     def hasadjustments(self):
-        """ True if picture has adjustments """
+        """ True if picture has adjustments / edits """
         return True if self.__info["hasAdjustments"] == 1 else False
 
+    def external_edit(self):
+        """ Returns True if picture was edited outside of Photos using external editor """
+        return (
+            True
+            if self.__info["adjustmentFormatID"] == "com.apple.Photos.externalEdit"
+            else False
+        )
+
     def favorite(self):
         """ True if picture is marked as favorite """
         return True if self.__info["favorite"] == 1 else False

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>1368</integer>
+	<integer>2774</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>2019-11-13T03:46:27Z</date>
+	<date>2019-12-01T15:27:50Z</date>
 	<key>BackgroundHighlightEnrichment</key>
-	<date>2019-11-13T03:46:27Z</date>
+	<date>2019-12-01T15:27:50Z</date>
 	<key>BackgroundJobAssetRevGeocode</key>
-	<date>2019-11-13T03:46:27Z</date>
+	<date>2019-12-01T15:27:51Z</date>
 	<key>BackgroundJobSearch</key>
-	<date>2019-11-13T03:46:27Z</date>
+	<date>2019-12-01T15:27:51Z</date>
 	<key>BackgroundPeopleSuggestion</key>
-	<date>2019-11-13T03:46:27Z</date>
+	<date>2019-12-01T15:27:50Z</date>
 	<key>BackgroundUserBehaviorProcessor</key>
-	<date>2019-11-13T03:46:28Z</date>
+	<date>2019-12-01T15:27:51Z</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>
+	<date>2019-12-01T15:27:51Z</date>
 	<key>SiriPortraitDonation</key>
-	<date>2019-11-13T03:46:28Z</date>
+	<date>2019-12-01T15:27:51Z</date>
 </dict>
 </plist>

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

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>FaceIDModelLastGenerationKey</key>
-	<date>2019-11-13T03:46:28Z</date>
+	<date>2019-12-01T15:27:51Z</date>
 	<key>LastContactClassificationKey</key>
 	<date>2019-11-13T03:46:29Z</date>
 </dict>

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

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>PVClustererBringUpState</key>
-	<integer>50</integer>
+	<integer>40</integer>
 </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>6</integer>
+	<integer>5</integer>
 	<key>PersonBuilderLastMinimumFaceGroupSizeForCreatingMergeCandidates</key>
 	<integer>15</integer>
 	<key>PersonBuilderMergeCandidatesEnabled</key>

tests/Test-10.15.1.photoslibrary/resources/renders/D/DC99FBDD-7A52-4100-A5BB-344131646C30.plist

@@ -0,0 +1,20 @@
+<?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>adjustmentBaseVersion</key>
+	<integer>0</integer>
+	<key>adjustmentData</key>
+	<data>
+	shkyAAAAAAACAAAA
+	</data>
+	<key>adjustmentEditorBundleID</key>
+	<string>com.apple.Photos</string>
+	<key>adjustmentFormatIdentifier</key>
+	<string>com.apple.Photos.externalEdit</string>
+	<key>adjustmentFormatVersion</key>
+	<string>1</string>
+	<key>adjustmentTimestamp</key>
+	<date>2019-12-01T15:27:48Z</date>
+</dict>
+</plist>

tests/test_catalina_10_15_1.py

@@ -44,7 +44,7 @@ def test_db_version():
 
     photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
     # assert photosdb.get_db_version() in osxphotos._TESTED_DB_VERSIONS
-    assert photosdb.get_db_version() == "6000" 
+    assert photosdb.get_db_version() == "6000"
 
 
 def test_os_version():
@@ -231,6 +231,30 @@ def test_hasadjustments2():
     assert p.hasadjustments() == False
 
 
+def test_external_edit1():
+    # test image has been edited in external editor
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=["DC99FBDD-7A52-4100-A5BB-344131646C30"])
+    assert len(photos) == 1
+    p = photos[0]
+
+    assert p.external_edit() == True
+
+
+def test_external_edit2():
+    # test image has not been edited in external editor
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=["E9BC5C36-7CD1-40A1-A72B-8B8FAC227D51"])
+    assert len(photos) == 1
+    p = photos[0]
+
+    assert p.external_edit() == False
+
+
 def test_path_edited1():
     # test a valid edited path
     import osxphotos