Supports duplicate album names (treated as single album)

This commit is contained in:
Rhet Turnbull
2019-12-07 12:51:39 -08:00
parent ff4066c49c
commit 2a0f27ca57
37 changed files with 38 additions and 27 deletions

View File

@@ -7,7 +7,7 @@
<key>hostuuid</key>
<string>9575E48B-8D5F-5654-ABAC-4431B1167324</string>
<key>pid</key>
<integer>2774</integer>
<integer>26720</integer>
<key>processname</key>
<string>photolibraryd</string>
<key>uid</key>

View File

@@ -4,8 +4,6 @@
<dict>
<key>BlacklistedMeaningsByMeaning</key>
<dict/>
<key>MePersonUUID</key>
<string>39488755-78C0-40B2-B378-EDA280E1823C</string>
<key>SceneWhitelist</key>
<array>
<string>Graduation</string>

View File

@@ -4,6 +4,10 @@
<dict>
<key>CollapsedSidebarSectionIdentifiers</key>
<array/>
<key>ExpandedSidebarItemIdentifiers</key>
<array>
<string>92D68107-B6C7-453B-96D2-97B0F26D5B8B/L0/020</string>
</array>
<key>Photos</key>
<dict>
<key>CollapsedSidebarSectionIdentifiers</key>

View File

@@ -3,24 +3,24 @@
<plist version="1.0">
<dict>
<key>BackgroundHighlightCollection</key>
<date>2019-12-01T15:27:50Z</date>
<date>0000-12-30T00:00:00Z</date>
<key>BackgroundHighlightEnrichment</key>
<date>2019-12-01T15:27:50Z</date>
<date>0000-12-30T00:00:00Z</date>
<key>BackgroundJobAssetRevGeocode</key>
<date>2019-12-01T15:27:51Z</date>
<date>0000-12-30T00:00:00Z</date>
<key>BackgroundJobSearch</key>
<date>2019-12-01T15:27:51Z</date>
<date>0000-12-30T00:00:00Z</date>
<key>BackgroundPeopleSuggestion</key>
<date>2019-12-01T15:27:50Z</date>
<date>0000-12-30T00:00:00Z</date>
<key>BackgroundUserBehaviorProcessor</key>
<date>2019-12-01T15:27:51Z</date>
<date>0000-12-30T00:00:00Z</date>
<key>PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey</key>
<date>2019-11-13T03:46:28Z</date>
<date>2019-12-07T19:48:13Z</date>
<key>PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate</key>
<date>2019-11-13T03:46:27Z</date>
<date>2019-12-07T19:48:13Z</date>
<key>PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate</key>
<date>2019-12-01T15:27:51Z</date>
<key>SiriPortraitDonation</key>
<date>2019-12-01T15:27:51Z</date>
<date>0000-12-30T00:00:00Z</date>
</dict>
</plist>

View File

@@ -16,7 +16,7 @@ KEYWORDS = [
]
# Photos 5 includes blank person for detected face
PERSONS = ["Katie", "Suzy", "Maria", ""]
ALBUMS = ["Pumpkin Farm"]
ALBUMS = ["Pumpkin Farm", "Test Album"] # Note: there are 2 albums named "Test Album" for testing duplicate album names
KEYWORDS_DICT = {
"Kids": 4,
"wedding": 2,
@@ -29,7 +29,8 @@ KEYWORDS_DICT = {
"United Kingdom": 1,
}
PERSONS_DICT = {"Katie": 3, "Suzy": 2, "Maria": 1, "": 1}
ALBUM_DICT = {"Pumpkin Farm": 3}
ALBUM_DICT = {"Pumpkin Farm": 3, "Test Album": 2} # Note: there are 2 albums named "Test Album" for testing duplicate album names
def test_init():
@@ -124,7 +125,7 @@ def test_attributes():
)
assert p.description() == "Girl holding pumpkin"
assert p.name() == "I found one!"
assert p.albums() == ["Pumpkin Farm"]
assert p.albums() == ["Pumpkin Farm", "Test Album"]
assert p.persons() == ["Katie"]
assert p.path().endswith(
"tests/Test-10.15.1.photoslibrary/originals/D/D79B8D77-BFFC-460B-9312-034F2877D35B.jpeg"