diff --git a/README.md b/README.md index ac6b0cee..60bcf4d4 100644 --- a/README.md +++ b/README.md @@ -172,7 +172,7 @@ Returns a list of the keywords found in the Photos library albums = photosdb.albums() ``` -Returns a list of the albums found in the Photos library +Returns a list of the albums found in the Photos library. **Note**: It is possible to have more than one album with the same name in Photos. Albums with duplicate names are treated as a single album and the photos in each are combined. For example, if you have two albums named "Wedding" and each has 2 photos, osxphotos will treat this as a single album named "Wedding" with 4 photos in it. #### ```persons``` ```python @@ -204,7 +204,7 @@ Returns a dictionary of persons (faces) found in the Photos library where key is albums_dict = photosdb.albums_as_dict() ``` -Returns a dictionary of albums found in the Photos library where key is the album name and value is the count of how many photos are in the album. Resulting dictionary is in reverse sorted order (e.g. album with the most photos is listed first) +Returns a dictionary of albums found in the Photos library where key is the album name and value is the count of how many photos are in the album. Resulting dictionary is in reverse sorted order (e.g. album with the most photos is listed first). **Note**: It is possible to have more than one album with the same name in Photos. Albums with duplicate names are treated as a single album and the photos in each are combined. For example, if you have two albums named "Wedding" and each has 2 photos, osxphotos will treat this as a single album named "Wedding" with 4 photos in it. #### ```get_photos_library_path``` ```python diff --git a/osxphotos/__init__.py b/osxphotos/__init__.py index d54af977..ec7b6438 100644 --- a/osxphotos/__init__.py +++ b/osxphotos/__init__.py @@ -234,7 +234,10 @@ class PhotosDB: albums = {} for k in self._dbalbums_album.keys(): title = self._dbalbum_details[k]["title"] - albums[title] = len(self._dbalbums_album[k]) + if title in albums: + albums[title] += len(self._dbalbums_album[k]) + else: + albums[title] = len(self._dbalbums_album[k]) albums = dict(sorted(albums.items(), key=lambda kv: kv[1], reverse=True)) return albums @@ -250,12 +253,12 @@ class PhotosDB: def albums(self): """ return list of albums found in photos database """ - albums = [] + # Could be more than one album with same name + # Right now, they are treated as same album and photos are combined from albums with same name + albums = set() for album in self._dbalbums_album.keys(): - albums.append(self._dbalbum_details[album]["title"]) - return albums - # albums = self._dbalbums_album.keys() - # return list(albums) + albums.add(self._dbalbum_details[album]["title"]) + return list(albums) def _setup_applescript(self): """ setup various applescripts used internally (e.g. to close Photos) """ @@ -1108,11 +1111,12 @@ class PhotosDB: album_titles[title] = [album_id] for album in albums: # TODO: can have >1 album with same name. This globs them together. - # Need a way to select with album - # TODO: document this in docs and add test + # Need a way to select with album? if album in album_titles: + album_set = set() for album_id in album_titles[album]: - photos_sets.append(set(self._dbalbums_album[album_id])) + album_set.update(self._dbalbums_album[album_id]) + photos_sets.append(album_set) else: logging.debug(f"Could not find album '{album}' in database") @@ -1140,12 +1144,15 @@ class PhotosDB: photoinfo = [] if photos_sets: # found some photos # get the intersection of each argument/search criteria + logging.debug(f"Got here: {photos_sets}") for p in set.intersection(*photos_sets): info = PhotoInfo(db=self, uuid=p, info=self._dbphotos[p]) photoinfo.append(info) + logging.debug(f"photoinfo: {pformat(photoinfo)}") return photoinfo def __repr__(self): + # TODO: update to use __class__ and __name__ return f"osxphotos.PhotosDB(dbfile='{self.get_db_path()}')" @@ -1367,6 +1374,7 @@ class PhotoInfo: return self.__info["latitude"] def __repr__(self): + # TODO: update to use __class__ and __name__ return f"osxphotos.PhotoInfo(db={self.__db}, uuid='{self.__uuid}', info={self.__info})" def __str__(self): diff --git a/setup.py b/setup.py index 5d3f2d78..b46dc60b 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ with open(path.join(this_directory, "README.md"), encoding="utf-8") as f: setup( name="osxphotos", - version="0.14.10", + version="0.14.11", description="Manipulate (read-only) Apple's Photos app library on Mac OS X", long_description=long_description, long_description_content_type="text/markdown", diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm index e5aa0a6b..423e48fe 100644 Binary files a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal index d3afacf2..6c58fd28 100644 Binary files a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock index 4626dfe3..8f57c691 100644 --- a/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock +++ b/tests/Test-10.15.1.photoslibrary/database/Photos.sqlite.lock @@ -7,7 +7,7 @@ hostuuid 9575E48B-8D5F-5654-ABAC-4431B1167324 pid - 2774 + 26720 processname photolibraryd uid diff --git a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite index 106b80ab..4ab71e6c 100644 Binary files a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite and b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite differ diff --git a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm index 3d9193a8..352b0681 100644 Binary files a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-wal b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-wal index e69de29b..e5e0ba81 100644 Binary files a/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/database/search/psi.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/database/search/searchMetadata.plist b/tests/Test-10.15.1.photoslibrary/database/search/searchMetadata.plist index 3eec4180..89aa2a1d 100644 --- a/tests/Test-10.15.1.photoslibrary/database/search/searchMetadata.plist +++ b/tests/Test-10.15.1.photoslibrary/database/search/searchMetadata.plist @@ -4,8 +4,6 @@ BlacklistedMeaningsByMeaning - MePersonUUID - 39488755-78C0-40B2-B378-EDA280E1823C SceneWhitelist Graduation diff --git a/tests/Test-10.15.1.photoslibrary/database/search/zeroKeywords.data b/tests/Test-10.15.1.photoslibrary/database/search/zeroKeywords.data index 8f6208e3..cb4f7e5e 100644 Binary files a/tests/Test-10.15.1.photoslibrary/database/search/zeroKeywords.data and b/tests/Test-10.15.1.photoslibrary/database/search/zeroKeywords.data differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.Photos/appPrivateData.plist b/tests/Test-10.15.1.photoslibrary/private/com.apple.Photos/appPrivateData.plist index b7c4af72..dcb4bf3b 100644 --- a/tests/Test-10.15.1.photoslibrary/private/com.apple.Photos/appPrivateData.plist +++ b/tests/Test-10.15.1.photoslibrary/private/com.apple.Photos/appPrivateData.plist @@ -4,6 +4,10 @@ CollapsedSidebarSectionIdentifiers + ExpandedSidebarItemIdentifiers + + 92D68107-B6C7-453B-96D2-97B0F26D5B8B/L0/020 + Photos CollapsedSidebarSectionIdentifiers diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db b/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db index 3508c5d8..ae685f43 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db and b/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm index c4b01dbf..99231b1d 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.mediaanalysisd/MediaAnalysis/mediaanalysis.db-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm index d3235436..e8f3b38e 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal index 3a59a058..887d609c 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.AOI.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm index fadecde7..bd109360 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal index 5481500a..13b99014 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.Nature.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm index bcd5cafe..7c39f36a 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal index f65c7ca8..c06024d4 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.POI.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm index 6b14eb41..a4e1d751 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal index 984e94b2..30a9f6f3 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSBusinessCategoryCache.ROI.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm index 1f7fc2e8..06c778c9 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSContactCache.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm index 7fd97a14..feb67024 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal index b438464e..e96285c9 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/CLSPublicEventCache.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite index 4ab71e6c..f0d86116 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm index 9cb6b028..5d574344 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal index 49c24909..e69de29b 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PGCurationCache.sqlite.sqlite-wal differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist index ce92c5a3..12f53f92 100644 --- a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist +++ b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotoAnalysisServicePreferences.plist @@ -3,24 +3,24 @@ BackgroundHighlightCollection - 2019-12-01T15:27:50Z + 0000-12-30T00:00:00Z BackgroundHighlightEnrichment - 2019-12-01T15:27:50Z + 0000-12-30T00:00:00Z BackgroundJobAssetRevGeocode - 2019-12-01T15:27:51Z + 0000-12-30T00:00:00Z BackgroundJobSearch - 2019-12-01T15:27:51Z + 0000-12-30T00:00:00Z BackgroundPeopleSuggestion - 2019-12-01T15:27:50Z + 0000-12-30T00:00:00Z BackgroundUserBehaviorProcessor - 2019-12-01T15:27:51Z + 0000-12-30T00:00:00Z PhotoAnalysisGraphLastBackgroundGraphConsistencyUpdateJobDateKey - 2019-11-13T03:46:28Z + 2019-12-07T19:48:13Z PhotoAnalysisGraphLastBackgroundGraphRebuildJobDate - 2019-11-13T03:46:27Z + 2019-12-07T19:48:13Z PhotoAnalysisGraphLastBackgroundMemoryGenerationJobDate 2019-12-01T15:27:51Z SiriPortraitDonation - 2019-12-01T15:27:51Z + 0000-12-30T00:00:00Z diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb index eb5dc73d..fa79cab0 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm index 0ed3d7e7..f8e4d78f 100644 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/PhotosGraph/photosgraph.kgdb-shm differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist deleted file mode 100644 index b7261d27..00000000 Binary files a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/changetoken.plist and /dev/null differ diff --git a/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/updatejetsam.plist b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/updatejetsam.plist new file mode 100644 index 00000000..34b13090 Binary files /dev/null and b/tests/Test-10.15.1.photoslibrary/private/com.apple.photoanalysisd/caches/graph/updatejetsam.plist differ diff --git a/tests/Test-10.15.1.photoslibrary/resources/journals/Album-change.plj b/tests/Test-10.15.1.photoslibrary/resources/journals/Album-change.plj new file mode 100644 index 00000000..6c21a031 Binary files /dev/null and b/tests/Test-10.15.1.photoslibrary/resources/journals/Album-change.plj differ diff --git a/tests/Test-10.15.1.photoslibrary/resources/journals/Folder-change.plj b/tests/Test-10.15.1.photoslibrary/resources/journals/Folder-change.plj index 755c708b..78626bfe 100644 Binary files a/tests/Test-10.15.1.photoslibrary/resources/journals/Folder-change.plj and b/tests/Test-10.15.1.photoslibrary/resources/journals/Folder-change.plj differ diff --git a/tests/Test-10.15.1.photoslibrary/resources/journals/HistoryToken.plist b/tests/Test-10.15.1.photoslibrary/resources/journals/HistoryToken.plist index 84092a1d..18c1d6a9 100644 Binary files a/tests/Test-10.15.1.photoslibrary/resources/journals/HistoryToken.plist and b/tests/Test-10.15.1.photoslibrary/resources/journals/HistoryToken.plist differ diff --git a/tests/test_catalina_10_15_1.py b/tests/test_catalina_10_15_1.py index cb2308b0..6e7ff193 100644 --- a/tests/test_catalina_10_15_1.py +++ b/tests/test_catalina_10_15_1.py @@ -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"