forked/osxphotos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for #517, #239

Browse Source
This commit is contained in:
Rhet Turnbull 2021-09-26 13:51:47 -07:00
parent 1cfdad0176
commit ac47df8475
4 changed files with 46 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osxphotos/_version.py
View File

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

28
osxphotos/photosdb/_photosdb_process_comments.py
View File

@ -70,12 +70,24 @@ def _process_comments_5(photosdb):
results = conn.execute( results = conn.execute(
""" """
SELECT DISTINCT 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)) db_comments["comments"].append(CommentInfo(dt, user_name, ismine, text))
# sort results # 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"]: if photosdb._db_comments_uuid[uuid]["likes"]:
photosdb._db_comments_uuid[uuid]["likes"].sort(key=lambda x: x.datetime) photosdb._db_comments_uuid[uuid]["likes"].sort(key=lambda x: x.datetime)
if photosdb._db_comments_uuid[uuid]["comments"]: 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() conn.close()

44
osxphotos/queries/shared_owner.sql.mako
View File

@ -1,25 +1,23 @@
-- Get the owner name of person who owns a photo in a shared album -- 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 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)"

8
tests/test_comments.py
View File

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