Merge branch 'merge/update-upload-helper' into 'master'

Move path_and_rename to core_helpers.py and delete old helper.py

See merge request AlekSIS/AlekSIS!125

aleksis/core/util/core_helpers.py

+import os
 import pkgutil
 from importlib import import_module
 from typing import Any, Callable, Sequence, Union
+from uuid import uuid4
 
 from django.conf import settings
 from django.db.models import Model
@@ -106,7 +108,7 @@ def has_person(obj: Union[HttpRequest, Model]) -> bool:
 
 def celery_optional(orig: Callable) -> Callable:
     """ Decorator that makes Celery optional for a function.
-    
+
     If Celery is configured and available, it wraps the function in a Task
     and calls its delay method when invoked; if not, it leaves it untouched
     and it is executed synchronously.
@@ -121,3 +123,18 @@ def celery_optional(orig: Callable) -> Callable:
         return wrapped
     else:
         return orig
+
+
+def path_and_rename(instance, filename: str, upload_to: str = "files") -> str:
+    """ Updates path of an uploaded file and renames it to a random UUID in Django FileField """
+
+    _, ext = os.path.splitext(filename)
+
+    # set filename as random string
+    new_filename = '{}.{}'.format(uuid4().hex, ext)
+
+    # Create upload directory if necessary
+    os.makedirs(os.path.join(settings.MEDIA_ROOT, upload_to), exist_ok=True)
+
+    # return the whole path to the file
+    return os.path.join(upload_to, new_filename)

aleksis/core/util/helper.py

-import os
-from uuid import uuid4
-
-from django.template.loader_tags import register
-
-
-def path_and_rename(instance, filename):
-    upload_to = 'menus'
-    ext = filename.split('.')[-1].lower()
-    # get filename
-    if instance.pk:
-        filename = '{}.{}'.format(instance.pk, ext)
-    else:
-        # set filename as random string
-        filename = '{}.{}'.format(uuid4().hex, ext)
-    # return the whole path to the file
-    return os.path.join(upload_to, filename)
-
-
-@register.inclusion_tag("components/msgbox.html")
-def msg_box(msg, status="success", icon="info"):
-    return {"msg": msg, "status": status, "icon": icon}