From 0d8a608da08560c48e10563bc2398da404ab3fea Mon Sep 17 00:00:00 2001
From: Stepan Krapivin <xevinbox@yandex.ru>
Date: Fri, 3 Nov 2017 19:38:05 +0500
Subject: [PATCH] fixes in thumbnails and watermarks

---
 batiskaf/jinja2_ext/thumbnails.py | 6 +++++-
 batiskaf/jinja2_ext/watermarks.py | 2 ++
 store/models.py                   | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/batiskaf/jinja2_ext/thumbnails.py b/batiskaf/jinja2_ext/thumbnails.py
index 4a43e1a..d9d52a4 100644
--- a/batiskaf/jinja2_ext/thumbnails.py
+++ b/batiskaf/jinja2_ext/thumbnails.py
@@ -1,7 +1,11 @@
 from easy_thumbnails.files import get_thumbnailer
+from easy_thumbnails.exceptions import InvalidImageFormatError
 
 
 def thumbnail(img, size='420x420'):
     weight, height = size.split('x')
     options = {'size': (int(weight), int(height)), 'background': '#fff'}
-    return get_thumbnailer(img).get_thumbnail(options)
+    try:
+        return get_thumbnailer(img).get_thumbnail(options)
+    except (ValueError, InvalidImageFormatError):
+        return {'url': ''}
diff --git a/batiskaf/jinja2_ext/watermarks.py b/batiskaf/jinja2_ext/watermarks.py
index 06b7e50..7db0640 100644
--- a/batiskaf/jinja2_ext/watermarks.py
+++ b/batiskaf/jinja2_ext/watermarks.py
@@ -3,4 +3,6 @@ from watermarker import core
 
 
 def watermark(url, wm):
+    if url is None:
+        url = ''
     return core.watermark(url, wm)
diff --git a/store/models.py b/store/models.py
index 8c1785f..089afc3 100644
--- a/store/models.py
+++ b/store/models.py
@@ -209,7 +209,7 @@ class Product(models.Model):
         try:
             return self.images.order_by('-is_main')[0].image
         except:
-            return None
+            return {'url': ''}
 
     def in_stock(self):
         return self.variations.filter(in_stock__gt=0).count()