Added hidden and favorite and test for 10.15

osxphotos/__init__.py

@@ -162,7 +162,6 @@ class PhotosDB:
 
         logging.debug(f"library = {library_path}, masters = {masters_path}")
 
-
         if int(self._db_version) < int(_PHOTOS_5_VERSION):
             self._process_database4()
         else:
@@ -487,7 +486,7 @@ class PhotosDB:
             + "RKVersion.lastmodifieddate, RKVersion.imageDate, RKVersion.mainRating, "
             + "RKVersion.hasAdjustments, RKVersion.hasKeywords, RKVersion.imageTimeZoneOffsetSeconds, "
             + "RKMaster.volumeId, RKMaster.imagePath, RKVersion.extendedDescription, RKVersion.name, "
-            + "RKMaster.isMissing, RKMaster.originalFileName "
+            + "RKMaster.isMissing, RKMaster.originalFileName, RKVersion.isFavorite, RKVersion.isHidden "
             + "from RKVersion, RKMaster where RKVersion.isInTrash = 0 and RKVersion.type = 2 and "
             + "RKVersion.masterUuid = RKMaster.uuid and RKVersion.filename not like '%.pdf'"
         )
@@ -523,6 +522,8 @@ class PhotosDB:
             self._dbphotos[uuid]["name"] = row[13]
             self._dbphotos[uuid]["isMissing"] = row[14]
             self._dbphotos[uuid]["originalFilename"] = row[15]
+            self._dbphotos[uuid]["favorite"] = row[16]
+            self._dbphotos[uuid]["hidden"] = row[17]
 
         conn.close()
 
@@ -580,7 +581,6 @@ class PhotosDB:
             logging.debug("Photos:")
             logging.debug(pformat(self._dbphotos))
 
-
     def _process_database5(self):
         """ process the Photos database to extract info """
         """ works on Photos version >= 5.0 """
@@ -639,7 +639,6 @@ class PhotosDB:
         logging.debug(pformat(self._dbfaces_person))
         logging.debug(self._dbfaces_uuid)
 
-
         i = 0
         c.execute(
             "SELECT COUNT(*)"
@@ -904,15 +903,13 @@ class PhotosDB:
             logging.debug("Photos:")
             logging.debug(pformat(self._dbphotos))
 
-
-    """ 
-    Return a list of PhotoInfo objects
-    If called with no args, returns the entire database of photos
-    If called with args, returns photos matching the args (e.g. keywords, persons, etc.)
-    If more than one arg, returns photos matching all the criteria (e.g. keywords AND persons)
-    """
-
     def photos(self, keywords=[], uuid=[], persons=[], albums=[]):
+        """ 
+        Return a list of PhotoInfo objects
+        If called with no args, returns the entire database of photos
+        If called with args, returns photos matching the args (e.g. keywords, persons, etc.)
+        If more than one arg, returns photos matching all the criteria (e.g. keywords AND persons)
+        """
         photos_sets = []  # list of photo sets to perform intersection of
         if not keywords and not uuid and not persons and not albums:
             # return all the photos
@@ -964,6 +961,7 @@ class PhotoInfo:
     Info about a specific photo, contains all the details about the photo
     including keywords, persons, albums, uuid, path, etc.
     """
+
     def __init__(self, db=None, uuid=None, info=None):
         self.__uuid = uuid
         self.__info = info
@@ -1072,6 +1070,14 @@ class PhotoInfo:
         """ TODO: not accurate for Photos version >= 5 """
         return True if self.__info["hasAdjustments"] == 1 else False
 
+    def favorite(self):
+        """ True if picture is marked as favorite """
+        return True if self.__info["favorite"] == 1 else False
+
+    def hidden(self):
+        """ True if picture is hidden """
+        return True if self.__info["hidden"] == 1 else False
+
     def __repr__(self):
         return f"osxphotos.PhotoInfo(db={self.__db}, uuid='{self.__uuid}', info={self.__info})"
 

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>3490</integer>
+	<integer>1368</integer>
 	<key>processname</key>
 	<string>photolibraryd</string>
 	<key>uid</key>

tests/test_catalina_10_15_1.py

@@ -142,6 +142,26 @@ def test_missing():
     assert p.ismissing() == True
 
 
+def test_favorite():
+    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.favorite() == True
+
+
+def test_hidden():
+    import osxphotos
+
+    photosdb = osxphotos.PhotosDB(dbfile=PHOTOS_DB)
+    photos = photosdb.photos(uuid=["A1DD1F98-2ECD-431F-9AC9-5AFEFE2D3A5C"])
+    assert len(photos) == 1
+    p = photos[0]
+    assert p.hidden() == True
+
+
 def test_count():
     import osxphotos