Fix for #517, #239

osxphotos/_version.py

@@ -1,4 +1,4 @@
 """ version info """
 
-__version__ = "0.42.85"
+__version__ = "0.42.86"
 

osxphotos/photosdb/_photosdb_process_comments.py

@@ -70,12 +70,24 @@ def _process_comments_5(photosdb):
     results = conn.execute(
         """
         SELECT DISTINCT
-        ZINVITEEHASHEDPERSONID,
+        ZINVITEEHASHEDPERSONID AS HASHEDPERSONID,
-        ZINVITEEFIRSTNAME,
+        ZINVITEEFIRSTNAME AS FIRSTNAME,
-        ZINVITEELASTNAME,
+        ZINVITEELASTNAME AS LASTNAME,
-        ZINVITEEFULLNAME
+        ZINVITEEFULLNAME AS FULLNAME
-        FROM
+        FROM ZCLOUDSHAREDALBUMINVITATIONRECORD
-        ZCLOUDSHAREDALBUMINVITATIONRECORD
+		WHERE HASHEDPERSONID IS NOT NULL 
+		AND HASHEDPERSONID != ""
+		AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL)
+	    UNION
+		SELECT DISTINCT
+		ZCLOUDOWNERHASHEDPERSONID AS HASHEDPERSONID,
+		ZCLOUDOWNERFIRSTNAME AS FIRSTNAME,
+		ZCLOUDOWNERLASTNAME AS LASTNAME,
+		ZCLOUDOWNERFULLNAME AS FULLNAME
+		FROM ZGENERICALBUM
+		WHERE HASHEDPERSONID IS NOT NULL 
+		AND HASHEDPERSONID != ""
+		AND NOT (FIRSTNAME IS NULL AND LASTNAME IS NULL) 
         """
     )
 
@@ -148,10 +160,10 @@ def _process_comments_5(photosdb):
             db_comments["comments"].append(CommentInfo(dt, user_name, ismine, text))
 
     # sort results
-    for uuid in photosdb._db_comments_uuid:
+    for uuid, value in photosdb._db_comments_uuid.items():
         if photosdb._db_comments_uuid[uuid]["likes"]:
             photosdb._db_comments_uuid[uuid]["likes"].sort(key=lambda x: x.datetime)
         if photosdb._db_comments_uuid[uuid]["comments"]:
-            photosdb._db_comments_uuid[uuid]["comments"].sort(key=lambda x: x.datetime)
+            value["comments"].sort(key=lambda x: x.datetime)
 
     conn.close()

osxphotos/queries/shared_owner.sql.mako

@@ -1,25 +1,23 @@
 -- Get the owner name of person who owns a photo in a shared album
-WITH case1 AS
+--
-(
+-- Case where someone has invited you to a shared album
-    -- Case where someone has invited you to a shared album
+-- Need to get the owner of the shared album
-    -- Need to get the owner of the shared album
+SELECT DISTINCT
-    SELECT ZGENERICALBUM.ZCLOUDOWNERFULLNAME as OWNER_FULLNAME
+ZGENERICALBUM.ZCLOUDOWNERFULLNAME as OWNER_FULLNAME
-    FROM ZGENERICALBUM
+FROM ZGENERICALBUM
-    JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID
+JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID
-    WHERE ${asset_table}.ZUUID = "${uuid}"
+WHERE ${asset_table}.ZUUID = "${uuid}"
-),
+AND ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID IS NOT NULL 
-case2 AS
+AND ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID != ""
-(
+AND OWNER_FULLNAME != "(null) (null)"
-    -- Case where you have invited someone to a shared album
-    -- Need to get the data for person who was invited to the album
-    SELECT
-    ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEFULLNAME AS OWNER_FULLNAME
-    FROM ZCLOUDSHAREDALBUMINVITATIONRECORD 
-    JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEHASHEDPERSONID
-    WHERE ${asset_table}.ZUUID = "${uuid}"
-    ORDER BY ZCLOUDSHAREDALBUMINVITATIONRECORD.Z_PK
-    LIMIT 1
-)
-SELECT * FROM case1
 UNION
-SELECT * FROM case2 WHERE NOT EXISTS (SELECT * FROM case1)
+-- Case where you have invited someone to a shared album
+-- Need to get the data for person who was invited to the album
+SELECT DISTINCT
+ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEFULLNAME AS OWNER_FULLNAME
+FROM ZCLOUDSHAREDALBUMINVITATIONRECORD 
+JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEHASHEDPERSONID
+WHERE ${asset_table}.ZUUID = "${uuid}"
+AND ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEHASHEDPERSONID IS NOT NULL
+AND ZCLOUDSHAREDALBUMINVITATIONRECORD.ZINVITEEHASHEDPERSONID != ""
+AND OWNER_FULLNAME != "(null) (null)"

tests/test_comments.py

@@ -13,7 +13,7 @@ COMMENT_UUID_DICT = {
     "4AD7C8EF-2991-4519-9D3A-7F44A6F031BE": [
         CommentInfo(
             datetime=datetime.datetime(2020, 9, 18, 10, 28, 41, 552000),
-            user=None,
+            user="Rhet Turnbull",
             ismine=False,
             text="Nice photo!",
         ),
@@ -39,7 +39,7 @@ LIKE_UUID_DICT = {
     "4AD7C8EF-2991-4519-9D3A-7F44A6F031BE": [
         LikeInfo(
             datetime=datetime.datetime(2020, 9, 18, 10, 28, 43, 335000),
-            user=None,
+            user="Rhet Turnbull",
             ismine=False,
         )
     ],
@@ -47,7 +47,7 @@ LIKE_UUID_DICT = {
     "65BADBD7-A50C-4956-96BA-1BB61155DA17": [
         LikeInfo(
             datetime=datetime.datetime(2020, 9, 18, 10, 28, 52, 570000),
-            user=None,
+            user="Rhet Turnbull",
             ismine=False,
         )
     ],
@@ -65,7 +65,7 @@ COMMENT_UUID_ASDICT = {
 LIKE_UUID_ASDICT = {
     "65BADBD7-A50C-4956-96BA-1BB61155DA17": {
         "datetime": datetime.datetime(2020, 9, 18, 10, 28, 52, 570000),
-        "user": None,
+        "user": "Rhet Turnbull",
         "ismine": False,
     }
 }