Added external_edit for Photos 5

This commit is contained in:
Rhet Turnbull
2019-12-01 07:36:16 -08:00
parent 6a2be3e7d9
commit 42baa29c18
37 changed files with 76 additions and 19 deletions

View File

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

View File

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

View File

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

View File

@@ -3,6 +3,6 @@
<plist version="1.0">
<dict>
<key>PVClustererBringUpState</key>
<integer>50</integer>
<integer>40</integer>
</dict>
</plist>

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 485 KiB

After

Width:  |  Height:  |  Size: 383 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 118 KiB

After

Width:  |  Height:  |  Size: 104 KiB

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 MiB

View File

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