voussoir/etiquette
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix return value of (photo, is_new) for digest.

Browse source
This commit is contained in:
voussoir 2022-08-21 14:01:43 -07:00
parent bdf2ba6334
commit 4f063cd90e
No known key found for this signature in database
GPG key ID: 5F7554F8C26DACCB
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
etiquette/photodb.py
View file

@ -1321,15 +1321,14 @@ class PDBUtilMixin:
otherwise create it and then return it. otherwise create it and then return it.
''' '''
try: try:
photo = (self.get_photo_by_path(filepath), False) return (self.get_photo_by_path(filepath), False)
return photo
except exceptions.NoSuchPhoto: except exceptions.NoSuchPhoto:
pass pass
result = check_renamed(filepath) result = check_renamed(filepath)
if isinstance(result, objects.Photo): if isinstance(result, objects.Photo):
result.relocate(filepath.absolute_path) result.relocate(filepath.absolute_path)
return result return (result, False)
elif isinstance(result, dict) and 'sha256' in result: elif isinstance(result, dict) and 'sha256' in result:
sha256 = result['sha256'] sha256 = result['sha256']
else: else: