From 811946018d5c4d32c673630f5089ea4ec2c093d1 Mon Sep 17 00:00:00 2001 From: Rhet Turnbull Date: Sat, 7 Dec 2019 13:13:34 -0800 Subject: [PATCH] Fixed warning message for duplicate edit_resource_id --- osxphotos/__init__.py | 3 ++- setup.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/osxphotos/__init__.py b/osxphotos/__init__.py index ec7b6438..279f2eff 100644 --- a/osxphotos/__init__.py +++ b/osxphotos/__init__.py @@ -656,13 +656,14 @@ class PhotosDB: and row[6] == 2 ): if "edit_resource_id" in self._dbphotos[uuid]: - logging.warning( + logging.debug( f"WARNING: found more than one edit_resource_id for " f"UUID {row[0]},adjustmentUUID {row[1]}, modelID {row[2]}" ) # TODO: I think there should never be more than one edit but # I've seen this once in my library # should we return all edits or just most recent one? + # For now, return most recent edit self._dbphotos[uuid]["edit_resource_id"] = row[2] # get details on external edits diff --git a/setup.py b/setup.py index b46dc60b..049a0aa1 100755 --- a/setup.py +++ b/setup.py @@ -38,7 +38,7 @@ with open(path.join(this_directory, "README.md"), encoding="utf-8") as f: setup( name="osxphotos", - version="0.14.11", + version="0.14.12", description="Manipulate (read-only) Apple's Photos app library on Mac OS X", long_description=long_description, long_description_content_type="text/markdown",