From 38bfb96b4670cc7fabb519b2a3345c2a16b2f8a2 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Thu, 26 Dec 2019 12:06:18 +0100
Subject: [PATCH] various image related fixes

---
 cookbook/models.py     | 19 +------------------
 cookbook/views/edit.py | 16 +++++++++++++++-
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/cookbook/models.py b/cookbook/models.py
index 756d79c8..40021487 100644
--- a/cookbook/models.py
+++ b/cookbook/models.py
@@ -1,8 +1,5 @@
-from io import BytesIO
-
-from PIL import Image
 from django.contrib.auth.models import User
-from django.core.files import File
+
 from django.db import models
 
 
@@ -73,20 +70,6 @@ class Recipe(models.Model):
     def __str__(self):
         return self.name
 
-    def save(self, *args, **kwargs):
-        if self.image:
-            img = Image.open(self.image)
-
-            basewidth = 720
-            wpercent = (basewidth / float(img.size[0]))
-            hsize = int((float(img.size[1]) * float(wpercent)))
-            img = img.resize((basewidth, hsize), Image.ANTIALIAS)
-
-            im_io = BytesIO()
-            img.save(im_io, 'JPEG', quality=70)
-            self.image = File(im_io, name=(str(self.pk)+'.jpeg'))
-        super().save(*args, **kwargs)
-
     @property
     def all_tags(self):
         return ' '.join([(x.icon + x.name) for x in self.keywords.all()])
diff --git a/cookbook/views/edit.py b/cookbook/views/edit.py
index 52a0bae9..a0b169b6 100644
--- a/cookbook/views/edit.py
+++ b/cookbook/views/edit.py
@@ -1,9 +1,12 @@
 import os
+from io import BytesIO
 import simplejson as json
+from PIL import Image
 
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.core.files import File
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect, get_object_or_404, render
 from django.urls import reverse_lazy, reverse
@@ -50,7 +53,18 @@ def internal_recipe_update(request, pk):
 
             if form.cleaned_data['image']:
                 recipe.image = form.cleaned_data['image']
-            else:
+
+                img = Image.open(recipe.image)
+
+                basewidth = 720
+                wpercent = (basewidth / float(img.size[0]))
+                hsize = int((float(img.size[1]) * float(wpercent)))
+                img = img.resize((basewidth, hsize), Image.ANTIALIAS)
+
+                im_io = BytesIO()
+                img.save(im_io, 'JPEG', quality=70)
+                recipe.image = File(im_io, name=(str(recipe.pk) + '.jpeg'))
+            elif 'image' in form.changed_data and form.cleaned_data['image'] is False:
                 recipe.image = None
 
             recipe.save()