From 06fa1edcae7139b543e17ec63810c37c18cc2780 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sat, 13 Jun 2020 08:52:23 -0700 Subject: [PATCH] Bug fix for issue #136 --- osxphotos/_version.py | 2 +- osxphotos/photosdb/photosdb.py | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/osxphotos/_version.py b/osxphotos/_version.py index 76fb3742..cb42f9a8 100644 --- a/osxphotos/_version.py +++ b/osxphotos/_version.py @@ -1,3 +1,3 @@ """ version info """ -__version__ = "0.29.13" +__version__ = "0.29.14" diff --git a/osxphotos/photosdb/photosdb.py b/osxphotos/photosdb/photosdb.py index 22208e02..24d525e2 100644 --- a/osxphotos/photosdb/photosdb.py +++ b/osxphotos/photosdb/photosdb.py @@ -1721,8 +1721,6 @@ class PhotosDB: # determine if a photo is missing in Photos 5 # Get info on remote/local availability for photos in shared albums - # Shared photos have a null fingerprint (and some other photos do too) - # TODO: There may be a bug here, perhaps ZDATASTORESUBTYPE should be 1 --> it's the longest ZDATALENGTH (is this the original) c.execute( """ SELECT ZGENERICASSET.ZUUID, @@ -1731,10 +1729,7 @@ class PhotosDB: FROM ZGENERICASSET JOIN ZADDITIONALASSETATTRIBUTES ON ZADDITIONALASSETATTRIBUTES.ZASSET = ZGENERICASSET.Z_PK JOIN ZINTERNALRESOURCE ON ZINTERNALRESOURCE.ZASSET = ZADDITIONALASSETATTRIBUTES.ZASSET - WHERE ZDATASTORESUBTYPE = 0 OR ZDATASTORESUBTYPE = 3 """ - # WHERE ZDATASTORESUBTYPE = 1 OR ZDATASTORESUBTYPE = 3 """ - # WHERE ZDATASTORESUBTYPE = 0 OR ZDATASTORESUBTYPE = 3 """ - # WHERE ZINTERNALRESOURCE.ZFINGERPRINT IS NULL AND ZINTERNALRESOURCE.ZDATASTORESUBTYPE = 3 """ + WHERE ZDATASTORESUBTYPE = 1 OR ZDATASTORESUBTYPE = 3 """ ) for row in c: