From 41a025e325d2299412da2bf45d5e2b1b306590eb Mon Sep 17 00:00:00 2001
From: vas3k <me@vas3k.ru>
Date: Mon, 6 Jan 2020 22:45:15 +0100
Subject: [PATCH] Convert favicons to PNG on upload

---
 requirements.txt |  1 +
 utils/images.py  | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 3a1cdd1..3d930ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
 Django==2.2.8
 psycopg2==2.8.3
 click==7.0
+pillow==7.0
 awesome-slugify>=1.6.5
 requests==2.22.0
 beautifulsoup4==4.6.2
diff --git a/utils/images.py b/utils/images.py
index e1505e9..e56ecac 100644
--- a/utils/images.py
+++ b/utils/images.py
@@ -4,12 +4,13 @@ import os
 from urllib.parse import urlparse
 
 import requests
+from PIL import Image
 from django.conf import settings
 
 log = logging.getLogger(__name__)
 
 
-def upload_image_from_url(url):
+def upload_image_from_url(url, resize=(192, 192), convert_format="PNG"):
     if not url:
         return None
 
@@ -22,6 +23,13 @@ def upload_image_from_url(url):
     except requests.exceptions.RequestException:
         return None
 
+    if resize:
+        image = Image.open(image_data)
+        image.thumbnail(resize)
+        saved_image = io.BytesIO()
+        image.save(saved_image, format=convert_format, optimize=True)
+        image_data = saved_image.getvalue()
+
     try:
         uploaded = requests.post(
             url=settings.MEDIA_UPLOAD_URL,
@@ -32,16 +40,15 @@ def upload_image_from_url(url):
                 "media": (image_name, image_data)
             }
         )
-    except requests.exceptions.RequestException:
+    except requests.exceptions.RequestException as ex:
+        log.error(f"Image upload error: {ex}")
         return None
-    finally:
-        image_data.close()
 
     if 200 <= uploaded.status_code <= 299:
         try:
             response_data = uploaded.json()
         except Exception as ex:
-            log.exception(f"Error uploading avatar: {ex}")
+            log.exception(f"Image upload error: {ex} ({uploaded.content})")
             return None
 
         return response_data["uploaded"][0]