From 37508d25835319363185f26d92cdeb399215e6c8 Mon Sep 17 00:00:00 2001 From: Joachim Date: Sat, 20 Nov 2021 16:23:50 +0100 Subject: [PATCH] Update preview_images.py --- bookwyrm/preview_images.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/bookwyrm/preview_images.py b/bookwyrm/preview_images.py index 8224a278..179dcf11 100644 --- a/bookwyrm/preview_images.py +++ b/bookwyrm/preview_images.py @@ -11,7 +11,6 @@ from PIL import Image, ImageDraw, ImageFont, ImageOps, ImageColor from django.core.files.base import ContentFile from django.core.files.uploadedfile import InMemoryUploadedFile -from django.core.files.storage import default_storage from django.db.models import Avg from bookwyrm import models, settings @@ -318,14 +317,13 @@ def save_and_cleanup(image, instance=None): if not isinstance(instance, (models.Book, models.User, models.SiteSettings)): return False uuid = uuid4() - file_name = f"{instance.id}-{uuid}.jpg" image_buffer = BytesIO() try: try: - old_path = instance.preview_image.name + file_name = instance.preview_image.name except ValueError: - old_path = None + file_name = f"{instance.id}-{uuid}.jpg" # Save image.save(image_buffer, format="jpeg", quality=75) @@ -345,10 +343,6 @@ def save_and_cleanup(image, instance=None): else: instance.save(update_fields=["preview_image"]) - # Clean up old file after saving - if old_path and default_storage.exists(old_path): - default_storage.delete(old_path) - finally: image_buffer.close() return True