Fixed tests for comment fix

Updated docs [skip ci]
Merge branch 'master' of github.com:RhetTbull/osxphotos
2021-09-26 14:07:35 -07:00 · 2021-09-26 14:00:46 -07:00 · 2021-09-26 13:53:32 -07:00 · 2021-09-26 13:53:21 -07:00 · 2021-09-26 13:51:47 -07:00 · 2021-09-26 09:06:17 -07:00
16 changed files with 67 additions and 48 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. Dates are d

 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

+#### [v0.42.85](https://github.com/RhetTbull/osxphotos/compare/v0.42.84...v0.42.85)
+
+> 25 September 2021
+
+- Implemented PhotoInfo.owner, AlbumInfo.owner, #216, #239 [`c4b7c26`](https://github.com/RhetTbull/osxphotos/commit/c4b7c2623f077d9964d5d578ce6c01bb83fab088)
+- Updated docs [skip ci] [`59ba325`](https://github.com/RhetTbull/osxphotos/commit/59ba325273b2f16935be944fd46c1237ce637bb8)
+
 #### [v0.42.84](https://github.com/RhetTbull/osxphotos/compare/v0.42.83...v0.42.84)

 > 25 September 2021
--- a/README.md
+++ b/README.md
@@ -1702,7 +1702,7 @@ Substitution                    Description
 {lf}                            A line feed: '\n', alias for {newline}
 {cr}                            A carriage return: '\r'
 {crlf}                          a carriage return + line feed: '\r\n'
-{osxphotos_version}             The osxphotos version, e.g. '0.42.85'
+{osxphotos_version}             The osxphotos version, e.g. '0.42.86'
 {osxphotos_cmd_line}            The full command line used to run osxphotos

 The following substitutions may result in multiple values. Thus if specified for
@@ -2373,6 +2373,8 @@ For example, in my library, Photos says I have 19,386 photos and 474 movies.  Ho
 #### <a name="getphoto">`get_photo(uuid)`</A>
 Returns a single PhotoInfo instance for photo with UUID matching `uuid` or None if no photo is found matching `uuid`.  If you know the UUID of a photo, `get_photo()` is much faster than `photos`.  See also [photos()](#photos).

+#### `execute(sql)`
+Execute sql statement against the Photos database and return a sqlite cursor with the results.

 ### PhotoInfo 
 PhotosDB.photos() returns a list of PhotoInfo objects.  Each PhotoInfo object represents a single photo in the Photos library.
@@ -3571,7 +3573,7 @@ The following template field substitutions are availabe for use the templating s
 |{lf}|A line feed: '\n', alias for {newline}|
 |{cr}|A carriage return: '\r'|
 |{crlf}|a carriage return + line feed: '\r\n'|
-|{osxphotos_version}|The osxphotos version, e.g. '0.42.85'|
+|{osxphotos_version}|The osxphotos version, e.g. '0.42.86'|
 |{osxphotos_cmd_line}|The full command line used to run osxphotos|
 |{album}|Album(s) photo is contained in|
 |{folder_album}|Folder path + album photo is contained in. e.g. 'Folder/Subfolder/Album' or just 'Album' if no enclosing folder|
--- a/docs/.buildinfo
+++ b/docs/.buildinfo
@@ -1,4 +1,4 @@
 # Sphinx build info version 1
 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
-config: 11213341ff264627411779714707b4d3
+config: 68de544013fe1e61b68c366a1cc4b278
 tags: 645f666f9bcd5a90fca523b33c5a78b7
--- a/docs/_modules/index.html
+++ b/docs/_modules/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Overview: module code &#8212; osxphotos 0.42.85 documentation</title>
+    <title>Overview: module code &#8212; osxphotos 0.42.86 documentation</title>
    <link rel="stylesheet" type="text/css" href="../_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="../_static/alabaster.css" />
    <script data-url_root="../" id="documentation_options" src="../_static/documentation_options.js"></script>
--- a/docs/_static/documentation_options.js
+++ b/docs/_static/documentation_options.js
@@ -1,6 +1,6 @@
 var DOCUMENTATION_OPTIONS = {
    URL_ROOT: document.getElementById("documentation_options").getAttribute('data-url_root'),
-    VERSION: '0.42.85',
+    VERSION: '0.42.86',
    LANGUAGE: 'None',
    COLLAPSE_INDEX: false,
    BUILDER: 'html',
--- a/docs/cli.html
+++ b/docs/cli.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.42.85 documentation</title>
+    <title>osxphotos command line interface (CLI) &#8212; osxphotos 0.42.86 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/genindex.html
+++ b/docs/genindex.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Index &#8212; osxphotos 0.42.85 documentation</title>
+    <title>Index &#8212; osxphotos 0.42.86 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.42.85 documentation</title>
+    <title>Welcome to osxphotos’s documentation! &#8212; osxphotos 0.42.86 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/modules.html
+++ b/docs/modules.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos &#8212; osxphotos 0.42.85 documentation</title>
+    <title>osxphotos &#8212; osxphotos 0.42.86 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/reference.html
+++ b/docs/reference.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>osxphotos package &#8212; osxphotos 0.42.85 documentation</title>
+    <title>osxphotos package &#8212; osxphotos 0.42.86 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    <script data-url_root="./" id="documentation_options" src="_static/documentation_options.js"></script>
--- a/docs/search.html
+++ b/docs/search.html
@@ -5,7 +5,7 @@
  <head>
    <meta charset="utf-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Search &#8212; osxphotos 0.42.85 documentation</title>
+    <title>Search &#8212; osxphotos 0.42.86 documentation</title>
    <link rel="stylesheet" type="text/css" href="_static/pygments.css" />
    <link rel="stylesheet" type="text/css" href="_static/alabaster.css" />
    
--- a/osxphotos/_version.py
+++ b/osxphotos/_version.py
@@ -1,4 +1,4 @@
 """ version info """

-__version__ = "0.42.85"
+__version__ = "0.42.86"

--- a/osxphotos/photosdb/_photosdb_process_comments.py
+++ b/osxphotos/photosdb/_photosdb_process_comments.py
@@ -70,12 +70,24 @@ def _process_comments_5(photosdb):
    results = conn.execute(
        """
        SELECT DISTINCT
-        ZINVITEEHASHEDPERSONID,
-        ZINVITEEFIRSTNAME,
-        ZINVITEELASTNAME,
-        ZINVITEEFULLNAME
-        FROM
-        ZCLOUDSHAREDALBUMINVITATIONRECORD
+        ZINVITEEHASHEDPERSONID AS HASHEDPERSONID,
+        ZINVITEEFIRSTNAME AS FIRSTNAME,
+        ZINVITEELASTNAME AS LASTNAME,
+        ZINVITEEFULLNAME AS FULLNAME
+        FROM 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()
--- a/osxphotos/queries/shared_owner.sql.mako
+++ b/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
-    -- Need to get the owner of the shared album
-    SELECT ZGENERICALBUM.ZCLOUDOWNERFULLNAME as OWNER_FULLNAME
-    FROM ZGENERICALBUM
-    JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID
-    WHERE ${asset_table}.ZUUID = "${uuid}"
-),
-case2 AS
-(
-    -- 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
+--
+-- Case where someone has invited you to a shared album
+-- Need to get the owner of the shared album
+SELECT DISTINCT
+ZGENERICALBUM.ZCLOUDOWNERFULLNAME as OWNER_FULLNAME
+FROM ZGENERICALBUM
+JOIN ${asset_table} ON ${asset_table}.ZCLOUDOWNERHASHEDPERSONID = ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID
+WHERE ${asset_table}.ZUUID = "${uuid}"
+AND ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID IS NOT NULL 
+AND ZGENERICALBUM.ZCLOUDOWNERHASHEDPERSONID != ""
+AND OWNER_FULLNAME != "(null) (null)"
 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)"
--- a/tests/test_comments.py
+++ b/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,
    }
 }
--- a/tests/test_template.py
+++ b/tests/test_template.py
@@ -272,7 +272,7 @@ TEMPLATE_VALUES_DETECTED_TEXT = {

 COMMENT_UUID_DICT = {
    "4AD7C8EF-2991-4519-9D3A-7F44A6F031BE": [
-        "None: Nice photo!",
+        "Rhet Turnbull: Nice photo!",
        "None: Wish I was back here!",
    ],
    "CCBE0EB9-AE9F-4479-BFFD-107042C75227": ["_"],
Author	SHA1	Message	Date
Rhet Turnbull	1b40e9d65f	Fixed tests for comment fix	2021-09-26 14:07:35 -07:00
Rhet Turnbull	725f7c8735	Updated docs [skip ci]	2021-09-26 14:00:46 -07:00
Rhet Turnbull	7cc8578148	Merge branch 'master' of github.com:RhetTbull/osxphotos	2021-09-26 13:53:32 -07:00
Rhet Turnbull	6adafb8ce7	Fixed formatting	2021-09-26 13:53:21 -07:00
Rhet Turnbull	ac47df8475	Fix for #517 , #239	2021-09-26 13:51:47 -07:00
Rhet Turnbull	f680cf78ab	Removed macOS-11, need to fix detected_text test	2021-09-26 09:06:17 -07:00
Rhet Turnbull	c86e84c534	Removed python 3.10-dev, not available in GH	2021-09-26 08:06:32 -07:00
Rhet Turnbull	3fb611825c	Added python 3.10, macOS 11	2021-09-26 07:53:32 -07:00
Rhet Turnbull	1cfdad0176	Updated CHANGELOG.md [skip ci]	2021-09-25 22:51:30 -07:00