From c40cb86dbdea4ed0f6fc66bbe4e6b1767e90eef8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Hermida?= Date: Wed, 19 Sep 2018 11:13:18 +0200 Subject: [PATCH] Refactor get_thumbnail_url --- taiga/base/utils/thumbnails.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/taiga/base/utils/thumbnails.py b/taiga/base/utils/thumbnails.py index e6d6a4b0..6d502142 100644 --- a/taiga/base/utils/thumbnails.py +++ b/taiga/base/utils/thumbnails.py @@ -68,7 +68,7 @@ def psd_image_factory(data, *args): Image.register_open("PSD", psd_image_factory) -def get_thumbnail_url(file_obj, thumbnailer_size): +def get_thumbnail(file_obj, thumbnailer_size): # Ugly hack to temporary ignore tiff files relative_name = file_obj if isinstance(file_obj, FieldFile): @@ -79,9 +79,18 @@ def get_thumbnail_url(file_obj, thumbnailer_size): return None try: - path_url = get_thumbnailer(file_obj)[thumbnailer_size].url - thumb_url = get_absolute_url(path_url) + thumbnailer = get_thumbnailer(file_obj) + return thumbnailer[thumbnailer_size] except InvalidImageFormatError: - thumb_url = None + return None + +def get_thumbnail_url(file_obj, thumbnailer_size): + thumbnail = get_thumbnail(file_obj, thumbnailer_size) + + if not thumbnail: + return None + + path_url = thumbnail.url + thumb_url = get_absolute_url(path_url) return thumb_url