Added incloud and iscloudasset for Photos 4
|
After Width: | Height: | Size: 2.6 MiB |
|
After Width: | Height: | Size: 2.0 MiB |
|
After Width: | Height: | Size: 2.6 MiB |
|
After Width: | Height: | Size: 2.1 MiB |
|
After Width: | Height: | Size: 4.7 MiB |
|
After Width: | Height: | Size: 345 KiB |
|
After Width: | Height: | Size: 344 KiB |
|
After Width: | Height: | Size: 2.4 MiB |
|
After Width: | Height: | Size: 474 KiB |
@@ -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>DatabaseMinorVersion</key>
|
||||
<integer>1</integer>
|
||||
<key>DatabaseVersion</key>
|
||||
<integer>112</integer>
|
||||
<key>LastOpenMode</key>
|
||||
<integer>2</integer>
|
||||
<key>LibrarySchemaVersion</key>
|
||||
<integer>4025</integer>
|
||||
<key>MetaSchemaVersion</key>
|
||||
<integer>2</integer>
|
||||
<key>createDate</key>
|
||||
<date>2020-01-11T16:53:11Z</date>
|
||||
</dict>
|
||||
</plist>
|
||||
BIN
tests/Test-Cloud-10.14.6.photoslibrary/database/metaSchema.db
Normal file
BIN
tests/Test-Cloud-10.14.6.photoslibrary/database/photos.db
Normal file
BIN
tests/Test-Cloud-10.14.6.photoslibrary/database/photos.db-wal
Normal file
@@ -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>2509</integer>
|
||||
<key>processname</key>
|
||||
<string>photolibraryd</string>
|
||||
<key>uid</key>
|
||||
<integer>503</integer>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,30 @@
|
||||
<?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>Photos</key>
|
||||
<dict>
|
||||
<key>CollapsedSidebarSectionIdentifiers</key>
|
||||
<array/>
|
||||
<key>ExpandedSidebarItemIdentifiers</key>
|
||||
<array>
|
||||
<string>TopLevelAlbums</string>
|
||||
<string>TopLevelSlideshows</string>
|
||||
</array>
|
||||
<key>IPXWorkspaceControllerZoomLevelsKey</key>
|
||||
<dict>
|
||||
<key>kZoomLevelIdentifierVersions</key>
|
||||
<integer>7</integer>
|
||||
</dict>
|
||||
<key>lastKnownItemCounts</key>
|
||||
<dict>
|
||||
<key>other</key>
|
||||
<integer>0</integer>
|
||||
<key>photos</key>
|
||||
<integer>9</integer>
|
||||
<key>videos</key>
|
||||
<integer>4</integer>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
|
After Width: | Height: | Size: 43 KiB |
|
After Width: | Height: | Size: 474 KiB |
@@ -0,0 +1,82 @@
|
||||
<?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>configuration</key>
|
||||
<dict>
|
||||
<key>client.request.throttle</key>
|
||||
<dict>
|
||||
<key>forget-after</key>
|
||||
<integer>3600</integer>
|
||||
<key>give-up-after</key>
|
||||
<integer>1800</integer>
|
||||
<key>start-after</key>
|
||||
<integer>2</integer>
|
||||
<key>wait-at-least</key>
|
||||
<integer>2</integer>
|
||||
<key>wait-at-most</key>
|
||||
<integer>60</integer>
|
||||
</dict>
|
||||
<key>max.days.inRecentlyDeleted</key>
|
||||
<integer>30</integer>
|
||||
<key>max.num.photosToImport.daily</key>
|
||||
<integer>50000</integer>
|
||||
<key>max.num.photosToImport.hourly</key>
|
||||
<integer>5000</integer>
|
||||
<key>max.num.recordsToUploadPerBatch</key>
|
||||
<integer>200</integer>
|
||||
<key>max.num.resourcesToDownloadPerPush</key>
|
||||
<integer>30</integer>
|
||||
<key>max.num.resourcesToUploadPerBatch</key>
|
||||
<integer>8</integer>
|
||||
<key>photo.derivatives</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>pixels</key>
|
||||
<integer>172800</integer>
|
||||
<key>type</key>
|
||||
<string>thumbnail</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>pixels</key>
|
||||
<integer>3145728</integer>
|
||||
<key>type</key>
|
||||
<string>preview</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>pixels</key>
|
||||
<integer>8388608</integer>
|
||||
<key>type</key>
|
||||
<string>fullSize</string>
|
||||
</dict>
|
||||
</array>
|
||||
<key>refresh.interval.seconds</key>
|
||||
<integer>7200</integer>
|
||||
<key>video.derivatives</key>
|
||||
<array>
|
||||
<dict>
|
||||
<key>pixels</key>
|
||||
<integer>921600</integer>
|
||||
<key>type</key>
|
||||
<string>PosterFrame</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>pixels</key>
|
||||
<integer>230400</integer>
|
||||
<key>type</key>
|
||||
<string>PosterFrameThumbnail</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>type</key>
|
||||
<string>720p</string>
|
||||
</dict>
|
||||
<dict>
|
||||
<key>type</key>
|
||||
<string>360p</string>
|
||||
</dict>
|
||||
</array>
|
||||
</dict>
|
||||
<key>lastUpdate</key>
|
||||
<date>2020-01-11T16:53:13Z</date>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1 @@
|
||||
2020-01-11 08.54.02.645
|
||||
@@ -0,0 +1 @@
|
||||
2020-01-11 08.53.12.488
|
||||
@@ -0,0 +1 @@
|
||||
2020-01-11 08.53.22.253
|
||||
@@ -0,0 +1,35 @@
|
||||
<?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>accountFlags</key>
|
||||
<data>
|
||||
CAEQABgB
|
||||
</data>
|
||||
<key>cloudAssetCountPerType</key>
|
||||
<dict>
|
||||
<key>public.image</key>
|
||||
<integer>8</integer>
|
||||
<key>public.movie</key>
|
||||
<integer>4</integer>
|
||||
</dict>
|
||||
<key>cloudAssetCountPerTypeLastCheckDate</key>
|
||||
<date>2020-01-11T16:54:24Z</date>
|
||||
<key>connectedToNetwork</key>
|
||||
<false/>
|
||||
<key>hasBatteryBudgetKey</key>
|
||||
<true/>
|
||||
<key>hasCellularBudgetKey</key>
|
||||
<true/>
|
||||
<key>hasChangesToProcess</key>
|
||||
<false/>
|
||||
<key>hasValidSystemBudgetKey</key>
|
||||
<true/>
|
||||
<key>iCloudLibraryExists</key>
|
||||
<true/>
|
||||
<key>initialSyncDate</key>
|
||||
<date>2020-01-11T16:53:22Z</date>
|
||||
<key>lastSyncDate</key>
|
||||
<date>2020-01-11T16:54:35Z</date>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1 @@
|
||||
17058154511
|
||||
@@ -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>ProcessedInQuiescentState</key>
|
||||
<true/>
|
||||
<key>Version</key>
|
||||
<integer>3</integer>
|
||||
</dict>
|
||||
</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>
|
||||
@@ -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>IncrementalPersonProcessingStage</key>
|
||||
<integer>4</integer>
|
||||
<key>PersonBuilderLastMinimumFaceGroupSizeForCreatingMergeCandidates</key>
|
||||
<integer>15</integer>
|
||||
</dict>
|
||||
</plist>
|
||||
|
After Width: | Height: | Size: 133 KiB |
@@ -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>PLLanguageAndLocaleKey</key>
|
||||
<string>en-US:en_US</string>
|
||||
<key>PLLastGeoProviderIdKey</key>
|
||||
<string>7618</string>
|
||||
<key>PLLastLocationInfoFormatVer</key>
|
||||
<integer>12</integer>
|
||||
<key>PLLastRevGeoForcedProviderOutOfDateCheckVersionKey</key>
|
||||
<integer>1</integer>
|
||||
<key>PLLastRevGeoVerFileFetchDateKey</key>
|
||||
<date>2020-01-11T16:53:12Z</date>
|
||||
</dict>
|
||||
</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>LastHistoryRowId</key>
|
||||
<integer>369</integer>
|
||||
<key>LibraryBuildTag</key>
|
||||
<string>71EE3C90-6321-40D4-96FC-79B95A7280E5</string>
|
||||
<key>LibrarySchemaVersion</key>
|
||||
<integer>4025</integer>
|
||||
</dict>
|
||||
</plist>
|
||||
@@ -0,0 +1,47 @@
|
||||
<?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>FileVersion</key>
|
||||
<integer>11</integer>
|
||||
<key>Source</key>
|
||||
<dict>
|
||||
<key>35230</key>
|
||||
<dict>
|
||||
<key>CountryMinVersions</key>
|
||||
<dict>
|
||||
<key>OTHER</key>
|
||||
<integer>1</integer>
|
||||
</dict>
|
||||
<key>CurrentVersion</key>
|
||||
<integer>1</integer>
|
||||
<key>NoResultErrorIsSuccess</key>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>57879</key>
|
||||
<dict>
|
||||
<key>CountryMinVersions</key>
|
||||
<dict>
|
||||
<key>OTHER</key>
|
||||
<integer>1</integer>
|
||||
</dict>
|
||||
<key>CurrentVersion</key>
|
||||
<integer>1</integer>
|
||||
<key>NoResultErrorIsSuccess</key>
|
||||
<true/>
|
||||
</dict>
|
||||
<key>7618</key>
|
||||
<dict>
|
||||
<key>AddCountyIfNeeded</key>
|
||||
<true/>
|
||||
<key>CountryMinVersions</key>
|
||||
<dict>
|
||||
<key>OTHER</key>
|
||||
<integer>10</integer>
|
||||
</dict>
|
||||
<key>CurrentVersion</key>
|
||||
<integer>10</integer>
|
||||
</dict>
|
||||
</dict>
|
||||
</dict>
|
||||
</plist>
|
||||
|
After Width: | Height: | Size: 213 KiB |
|
After Width: | Height: | Size: 27 KiB |
|
After Width: | Height: | Size: 134 KiB |
|
After Width: | Height: | Size: 511 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 168 KiB |
|
After Width: | Height: | Size: 31 KiB |
|
After Width: | Height: | Size: 173 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 299 KiB |
|
After Width: | Height: | Size: 34 KiB |
|
After Width: | Height: | Size: 234 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 235 KiB |
|
After Width: | Height: | Size: 23 KiB |
|
After Width: | Height: | Size: 184 KiB |
|
After Width: | Height: | Size: 692 KiB |
|
After Width: | Height: | Size: 39 KiB |
|
After Width: | Height: | Size: 223 KiB |
|
After Width: | Height: | Size: 350 KiB |
|
After Width: | Height: | Size: 45 KiB |
|
After Width: | Height: | Size: 234 KiB |
|
After Width: | Height: | Size: 29 KiB |
|
After Width: | Height: | Size: 214 KiB |
|
After Width: | Height: | Size: 25 KiB |
|
After Width: | Height: | Size: 172 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 133 KiB |
|
After Width: | Height: | Size: 117 KiB |
|
After Width: | Height: | Size: 199 KiB |
@@ -0,0 +1,22 @@
|
||||
<?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>DatabaseMinorVersion</key>
|
||||
<integer>1</integer>
|
||||
<key>DatabaseVersion</key>
|
||||
<integer>112</integer>
|
||||
<key>LibrarySchemaVersion</key>
|
||||
<integer>4025</integer>
|
||||
<key>MetaSchemaVersion</key>
|
||||
<integer>2</integer>
|
||||
<key>SnapshotComplete</key>
|
||||
<true/>
|
||||
<key>SnapshotCompletedDate</key>
|
||||
<date>2020-01-11T16:53:11Z</date>
|
||||
<key>SnapshotLastValidated</key>
|
||||
<date>2020-01-11T16:53:11Z</date>
|
||||
<key>SnapshotTables</key>
|
||||
<dict/>
|
||||
</dict>
|
||||
</plist>
|
||||
60
tests/test_incloud_mojave_10_14_6.py
Normal file
@@ -0,0 +1,60 @@
|
||||
# Test cloud photos
|
||||
|
||||
import pytest
|
||||
|
||||
PHOTOS_DB_CLOUD = "./tests/Test-Cloud-10.14.6.photoslibrary/database/photos.db"
|
||||
PHOTOS_DB_NOT_CLOUD = "./tests/Test-10.14.6.photoslibrary/database/photos.db"
|
||||
|
||||
UUID_DICT = {
|
||||
"incloud": "jNzHQgSxStK%Ll2aDOLakQ",
|
||||
"not_incloud": "h0m8G5PWTKqJwD4p9QGA5w",
|
||||
"cloudasset": "iOrNkBNSTxSELZtbSeBr1A",
|
||||
"not_cloudasset": "8SOE9s0XQVGsuq4ONohTng",
|
||||
}
|
||||
|
||||
|
||||
def test_incloud():
|
||||
import osxphotos
|
||||
|
||||
photosdb = osxphotos.PhotosDB(PHOTOS_DB_CLOUD)
|
||||
photos = photosdb.photos(uuid=[UUID_DICT["incloud"]])
|
||||
|
||||
assert photos[0].incloud
|
||||
|
||||
|
||||
def test_not_incloud():
|
||||
import osxphotos
|
||||
|
||||
photosdb = osxphotos.PhotosDB(PHOTOS_DB_CLOUD)
|
||||
photos = photosdb.photos(uuid=[UUID_DICT["not_incloud"]])
|
||||
|
||||
assert not photos[0].incloud
|
||||
|
||||
|
||||
def test_cloudasset_1():
|
||||
import osxphotos
|
||||
|
||||
photosdb = osxphotos.PhotosDB(PHOTOS_DB_CLOUD)
|
||||
photos = photosdb.photos(uuid=[UUID_DICT["cloudasset"]])
|
||||
|
||||
assert photos[0].iscloudasset
|
||||
|
||||
|
||||
def test_cloudasset_2():
|
||||
import osxphotos
|
||||
|
||||
photosdb = osxphotos.PhotosDB(PHOTOS_DB_CLOUD)
|
||||
photos = photosdb.photos(uuid=[UUID_DICT["not_incloud"]])
|
||||
|
||||
# not_incloud is still a cloud asset
|
||||
assert photos[0].iscloudasset
|
||||
|
||||
|
||||
def test_cloudasset_3():
|
||||
import osxphotos
|
||||
|
||||
photosdb = osxphotos.PhotosDB(PHOTOS_DB_NOT_CLOUD)
|
||||
photos = photosdb.photos(uuid=[UUID_DICT["not_cloudasset"]])
|
||||
|
||||
assert not photos[0].iscloudasset
|
||||
|
||||