From a6f9d1859e1c26ece167657c46e187407b94215f Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Tue, 19 Jan 2021 10:35:09 -0800 Subject: [PATCH] Move thumbnail work to normalize_thumbnail. --- etiquette/objects.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/etiquette/objects.py b/etiquette/objects.py index 2afbdc5..28710de 100644 --- a/etiquette/objects.py +++ b/etiquette/objects.py @@ -767,10 +767,7 @@ class Photo(ObjectBase): self.height = db_row['height'] self.ratio = db_row['ratio'] - if db_row['thumbnail'] is not None: - self.thumbnail = self.photodb.thumbnail_directory.join(db_row['thumbnail']) - else: - self.thumbnail = None + self.thumbnail = self.normalize_thumbnail(db_row['thumbnail']) self.searchhidden = db_row['searchhidden'] @@ -786,6 +783,16 @@ class Photo(ObjectBase): def __str__(self): return f'Photo:{self.id}:{self.basename}' + def normalize_thumbnail(self, thumbnail): + if thumbnail is None: + return None + + thumbnail = self.photodb.thumbnail_directory.join(thumbnail) + if not thumbnail.is_file: + return None + + return thumbnail + @staticmethod def normalize_override_filename(override_filename): if override_filename is None: