Merge pull request #167 from PROCOLLAB-github/dev

Dev

Author: yakser

.github/workflows/django-test.yml

@@ -13,10 +13,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: cache poetry install
         uses: actions/cache@v2

.github/workflows/lints.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.11]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/release-ci.yml

@@ -11,10 +11,10 @@ jobs:
     steps:
       - uses: actions/checkout@v2
 
-      - name: Set up Python 3.9
+      - name: Set up Python 3.11
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: 3.11
 
       - name: cache poetry install
         uses: actions/cache@v2

Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9
+FROM python:3.11
 
 RUN apt update --no-install-recommends -y
 

files/admin.py

@@ -1,10 +1,23 @@
+import reprlib
+
 from django.contrib import admin
+from django.forms import ModelForm, FileField
 
+from files.helpers import FileAPI
 from files.models import UserFile
 
 
+class UserFileForm(ModelForm):
+    file = FileField(required=True)
+
+    class Meta:
+        model = UserFile
+        fields = "__all__"
+
+
 @admin.register(UserFile)
 class UserFileAdmin(admin.ModelAdmin):
+    form = UserFileForm
     list_display = (
         "short_link",
         "filename",
@@ -34,4 +47,30 @@ def filename(self, obj):
 
     @admin.display(empty_value="Empty link")
     def short_link(self, obj):
-        return obj.link[15:40] + "..." + obj.link[-20:]
+        return reprlib.repr(obj.link.lstrip("https://")).strip("'")
+
+    def get_fieldsets(self, request, obj=None):
+        fieldsets = super().get_fieldsets(request, obj)
+        file_field_index = fieldsets[0][1]["fields"].index("file")
+        if obj:
+            # remove file field if file is already uploaded
+            del fieldsets[0][1]["fields"][file_field_index]
+        else:
+            # remove other field
+            fieldsets[0][1]["fields"] = ["file"]
+        return fieldsets
+
+    def save_model(self, request, obj, form, change):
+        file_api = FileAPI(request.FILES["file"], request.user)
+        url, info = file_api.upload()
+        obj.link = url
+        obj.user = request.user
+        obj.name = info.name
+        obj.size = info.size
+        obj.extension = info.extension
+        obj.mime_type = info.mime_type
+        super().save_model(request, obj, form, change)
+
+    def delete_model(self, request, obj):
+        FileAPI.delete(obj.link)
+        obj.delete()

files/helpers.py

@@ -1,10 +1,12 @@
+from typing import Union
+
 import requests
 import time
 import magic
-from django.core.files.uploadedfile import TemporaryUploadedFile
+from django.core.files.uploadedfile import TemporaryUploadedFile, InMemoryUploadedFile
 
 from files.exceptions import SelectelUploadError
-from files.models import UserFile
+from files.typings import UserFileInfo
 
 from procollab.settings import (
     DEBUG,
@@ -16,7 +18,10 @@
 
 
 class FileAPI:
-    def __init__(self, file: TemporaryUploadedFile, user) -> None:
+    # fixme: looks terrible
+    def __init__(
+        self, file: Union[TemporaryUploadedFile, InMemoryUploadedFile], user
+    ) -> None:
         self.file = file  # it's TemporaryUploadedFile, and it will be
         # removed after first .close() call, so we must read this file only once
         self.user = user
@@ -29,19 +34,25 @@ def delete(url: str) -> int:
         response = requests.delete(url, headers={"X-Auth-Token": token})
         return response.status_code
 
-    def upload(self) -> str:
+    def upload(self) -> tuple[str, UserFileInfo]:
         url = self._upload_via_selectel_swift()
-        info = get_file_info(self.file)
-        UserFile.objects.create(
-            user=self.user,
-            link=url,
-            name=info["name"],
-            size=info["size"],
-            extension=info["extension"],
-            # mime_type=info["mime_type"],
-        )
+        info = self.get_file_info(self.file)
         self.file_object.close()
-        return url
+        return url, info
+
+    def get_file_info(
+        self, file: Union[TemporaryUploadedFile, InMemoryUploadedFile]
+    ) -> UserFileInfo:
+        name, ext = file.name.split(".")
+        return UserFileInfo(
+            size=file.size, name=name, extension=ext, mime_type=self.get_file_mime_type()
+        )
+
+    def get_file_mime_type(self):
+        if isinstance(self.file, InMemoryUploadedFile):
+            return magic.from_buffer(self.file_object.read(), mime=True)
+        else:
+            return magic.from_file(self.file.temporary_file_path(), mime=True)
 
     def _upload_via_selectel_swift(self) -> str:
         token = self._get_selectel_swift_token()
@@ -102,18 +113,3 @@ def _generate_selectel_swift_file_url(self) -> str:
             link
             + f"{abs(hash(self.user.email))}/{abs(hash(self.file.name))}_{abs(hash(time.time()))}{extension}"
         )
-
-
-def get_file_info(file: TemporaryUploadedFile) -> dict:
-    name, ext = file.name.split(".")
-
-    return {
-        "size": file.size,
-        "name": name,
-        "extension": ext,
-        # "mime_type": get_file_mime_type(file),
-    }
-
-
-def get_file_mime_type(file: TemporaryUploadedFile):
-    return magic.from_file(file.name, mime=True)

files/migrations/0005_alter_userfile_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.1.3 on 2023-07-09 20:14
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("files", "0004_userfile_mime_type"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="userfile",
+            options={"verbose_name": "Файл", "verbose_name_plural": "Файлы"},
+        ),
+    ]

files/models.py

@@ -27,3 +27,7 @@ class UserFile(models.Model):
 
     def __str__(self):
         return f"UserFile by {self.user}, {self.link}"
+
+    class Meta:
+        verbose_name = "Файл"
+        verbose_name_plural = "Файлы"

files/typings.py

@@ -0,0 +1,12 @@
+from dataclasses import dataclass
+from typing import TypeAlias
+
+Bytes: TypeAlias = int
+
+
+@dataclass(slots=True, frozen=True)
+class UserFileInfo:
+    size: Bytes
+    name: str
+    extension: str
+    mime_type: str

files/views.py

@@ -17,9 +17,21 @@ class FileView(generics.GenericAPIView):
     @transaction.atomic
     def post(self, request):
         """creates a UserFile object and uploads the file to selectel"""
-        file_api = FileAPI(request.FILES["file"], request.user)
-        url = file_api.upload()
-        return Response({"url": url}, status=status.HTTP_201_CREATED)
+        try:
+            file_api = FileAPI(request.FILES["file"], request.user)
+            url, info = file_api.upload()
+            UserFile.objects.create(
+                user=request.user,
+                link=url,
+                name=info["name"],
+                size=info["size"],
+                extension=info["extension"],
+                mime_type=info["mime_type"],
+            )
+            return Response({"url": url}, status=status.HTTP_201_CREATED)
+        except Exception as error:
+            print(error)
+            return Response("Failed to upload file", status=status.HTTP_409_CONFLICT)
 
 
 def delete(self, request, *args, **kwargs):