From e662e8aa02dcd4b52f4066fe4a98224282139eba Mon Sep 17 00:00:00 2001
From: Rhet Turnbull <rturnbull+git@gmail.com>
Date: Wed, 25 Dec 2019 21:19:42 -0800
Subject: [PATCH] temporary fix for missing path on shared photos

---
 osxphotos/photosdb.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/osxphotos/photosdb.py b/osxphotos/photosdb.py
index 9e3e99dd..43e9a2f8 100644
--- a/osxphotos/photosdb.py
+++ b/osxphotos/photosdb.py
@@ -830,7 +830,8 @@ class PhotosDB:
             "ZGENERICASSET.ZFILENAME, "
             "ZGENERICASSET.ZLATITUDE, "
             "ZGENERICASSET.ZLONGITUDE, "
-            "ZGENERICASSET.ZHASADJUSTMENTS "
+            "ZGENERICASSET.ZHASADJUSTMENTS, "
+            "ZGENERICASSET.ZCLOUDOWNERHASHEDPERSONID "
             "FROM ZGENERICASSET "
             "JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK "
             "WHERE ZGENERICASSET.ZTRASHEDSTATE = 0 AND ZGENERICASSET.ZKIND = 0 "
@@ -853,6 +854,7 @@ class PhotosDB:
         # 13   "ZGENERICASSET.ZLATITUDE, "
         # 14   "ZGENERICASSET.ZLONGITUDE, "
         # 15   "ZGENERICASSET.ZHASADJUSTMENTS "
+        # 16   "ZCLOUDOWNERHASHEDPERSONID "
 
         i = 0
         for row in c:
@@ -860,6 +862,11 @@ class PhotosDB:
             uuid = row[0]
             logging.debug(f"i = {i:d}, uuid = '{uuid}")
 
+            # TODO: temporary fix for shared cloud photos
+            if row[16] is not None:
+                logging.debug(f"skipping shared cloud photo {uuid}, ZCLOUDOWNERHASHEDPERSONID: {row[16]}")
+                continue
+
             self._dbphotos[uuid] = {}
             self._dbphotos[uuid]["_uuid"] = uuid # stored here for easier debugging
             self._dbphotos[uuid]["modelID"] = None
@@ -893,6 +900,7 @@ class PhotosDB:
                 self._dbphotos[uuid]["longitude"] = row[14]
 
             self._dbphotos[uuid]["hasAdjustments"] = row[15]
+            self._dbphotos[uuid]["cloudOwnerHashedPersonID"] = row[16]
 
             # these will get filled in later
             # init to avoid key errors