Image saving proccess is now async

Author: orronai

lms/lmsweb/views.py

@@ -1,3 +1,4 @@
+import asyncio
 from typing import Any, Callable, Optional
 
 import arrow  # type: ignore
@@ -42,10 +43,11 @@
 )
 from lms.models.errors import (
     AlreadyExists, FileSizeError, ForbiddenPermission, LmsError,
-    UnauthorizedError, UploadError, fail,
+    UnauthorizedError, UnprocessableRequest, UploadError, fail,
 )
 from lms.models.users import (
-    SERIALIZER, auth, delete_previous_avatar, retrieve_salt, save_avatar,
+    SERIALIZER, auth, avatars_handler, create_avatar_filename,
+    delete_previous_avatar, retrieve_salt,
 )
 from lms.utils.consts import MB_CONVERSION, RTL_LANGUAGES
 from lms.utils.files import (
@@ -227,10 +229,16 @@ def avatar(filename):
 def update_avatar():
     form = UpdateAvatarForm()
     if form.validate_on_submit():
-        avatar_file = save_avatar(form.avatar.data)
+        try:
+            filename = create_avatar_filename(form.avatar.data)
+        except UnprocessableRequest as e:
+            error_message, status_code = e.args
+            return fail(status_code, error_message)
+
+        asyncio.run(avatars_handler(form.avatar.data, filename))
         if current_user.avatar:
             delete_previous_avatar(current_user.avatar)
-        current_user.avatar = avatar_file
+        current_user.avatar = filename
         current_user.save()
         return redirect(url_for('user', user_id=current_user.id))
 

lms/models/users.py

@@ -1,6 +1,8 @@
+import asyncio
+from functools import partial
 import os
 import re
-import secrets
+from uuid import uuid4
 
 from flask_babel import gettext as _  # type: ignore
 from itsdangerous import URLSafeTimedSerializer
@@ -11,7 +13,7 @@
 from lms.lmsweb import avatars_path, config
 from lms.models.errors import (
     AlreadyExists, ForbiddenPermission, UnauthorizedError,
-    UnhashedPasswordError,
+    UnhashedPasswordError, UnprocessableRequest,
 )
 
 
@@ -45,17 +47,31 @@ def generate_user_token(user: User) -> str:
     return SERIALIZER.dumps(user.mail_address, salt=retrieve_salt(user))
 
 
-def save_avatar(form_picture: FileStorage) -> str:
-    random_hex = secrets.token_hex(nbytes=8)
-    _, extension = os.path.splitext(form_picture.filename)
-    avatar_filename = random_hex + extension
-    avatar_path = avatars_path / avatar_filename
+def create_avatar_filename(form_picture: FileStorage) -> str:
+    __, extension = os.path.splitext(form_picture.filename)
+    if not extension:
+        raise UnprocessableRequest(_("Empty filename isn't allowed"), 422)
+    filename = str(uuid4())
+    return filename + extension
 
+
+def save_avatar(form_picture: FileStorage, filename: str) -> None:
+    avatar_path = avatars_path / filename
     output_size = (125, 125)
     image = Image.open(form_picture)
     image.thumbnail(output_size)
     image.save(avatar_path)
-    return avatar_filename
+
+
+async def async_avatars_proccess(form_picture: FileStorage, filename: str):
+    loop = asyncio.get_running_loop()
+    await loop.run_in_executor(
+        None, partial(save_avatar, form_picture, filename),
+    )
+
+
+async def avatars_handler(form_picture: FileStorage, filename: str):
+    asyncio.create_task(async_avatars_proccess(form_picture, filename))
 
 
 def delete_previous_avatar(avatar_name: str) -> None:

tests/samples/.jpg

@@ -215,6 +215,7 @@ class TestAvatar:
     IMAGE_NAME_2 = 'seaturtle.jpg'
     IMAGE_WRONG_EXTENSION = 'code1.py'
     IMAGE_BIG_SIZE = 'turtle.jpg'
+    IMAGE_NO_NAME = '.jpg'
 
     def setup(self):
         self.image_file = self.open_file(self.IMAGE_NAME)
@@ -223,18 +224,21 @@ def setup(self):
             self.IMAGE_WRONG_EXTENSION,
         )
         self.image_big_size_file = self.open_file(self.IMAGE_BIG_SIZE)
+        self.image_no_name_file = self.open_file(self.IMAGE_NO_NAME)
         self.image_storage = FileStorage(self.image_file)
         self.image_storage_2 = FileStorage(self.image_file_2)
         self.image_wrong_extension_storage = FileStorage(
             self.image_wrong_extension_file,
         )
         self.image_big_size_storage = FileStorage(self.image_big_size_file)
+        self.image_no_name_storage = FileStorage(self.image_no_name_file)
 
     def teardown(self):
         self.image_file.close()
         self.image_file_2.close()
         self.image_wrong_extension_file.close()
         self.image_big_size_file.close()
+        self.image_no_name_file.close()
 
     @staticmethod
     def open_file(filename: str) -> BufferedReader:
@@ -257,3 +261,8 @@ def test_upload_big_size_avatar(
         conftest.upload_avatar(client, self.image_big_size_storage)
         template, _ = captured_templates[-1]
         assert template.name == "update-avatar.html"
+
+    def test_upload_no_name_avatar(self, student_user: User):
+        client = conftest.get_logged_user(student_user.username)
+        response = conftest.upload_avatar(client, self.image_no_name_storage)
+        assert response.status_code == 422