Merge pull request #61 from skni-kod/fix/filenames-handling

Fix/filenames handling

Author: fkula5

papers/models.py

@@ -1,5 +1,4 @@
 import os
-import re
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models.signals import pre_delete
@@ -65,16 +64,24 @@ class CoAuthor(models.Model):
     paper = models.ForeignKey(Paper, on_delete=models.CASCADE)
 
 
+def remove_polish_chars(text):
+    polish_chars = {
+        'ą': 'a', 'ć': 'c', 'ę': 'e', 'ł': 'l', 'ń': 'n', 'ó': 'o', 'ś': 's', 'ź': 'z', 'ż': 'z',
+        'Ą': 'A', 'Ć': 'C', 'Ę': 'E', 'Ł': 'L', 'Ń': 'N', 'Ó': 'O', 'Ś': 'S', 'Ź': 'Z', 'Ż': 'Z'
+    }
+
+    for polish_char, ascii_char in polish_chars.items():
+        text = text.replace(polish_char, ascii_char)
+
+    return text
+
 def paper_directory_path(instance, filename):
-    name, ext = os.path.splitext(filename)
-    safe_name = slugify(name)
-    safe_name = textwrap.shorten(safe_name, width=100, placeholder='')
-    # _filename = filename.split('.')
-    # filename = re.sub(r'\W+', '', _filename[0])
-    # filename = filename.replace(' ','_')
-    # filename = textwrap.shorten(filename,width=100,placeholder='')
-    # filename += f'.{_filename[-1]}'
-    return f'paper_files/paperNo.{instance.paper.pk}/{safe_name}{ext.lower()}'
+    _filename = filename.split('.')
+    filename = re.sub(r'\W+', '', _filename[0])
+    filename = filename.replace(' ','_')
+    filename = textwrap.shorten(filename,width=100,placeholder='')
+    filename += f'.{_filename[-1]}'
+    return f'paper_files/paperNo.{instance.paper.pk}/{filename}'
 
 
 class UploadedFile(models.Model):

papers/views.py

@@ -1,7 +1,6 @@
-from email.utils import unquote
-
 from braces.views import CsrfExemptMixin
 from django.contrib import messages
+from urllib.parse import unquote
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin
 from django.contrib.messages.views import SuccessMessageMixin
@@ -123,19 +122,16 @@ def paper_file_download(request, pk, item):
     :param item: integer (id of a file user wants to download)
     :return:
     """
+    print("request", request, "pk", pk, "item", item)
     paper = Paper.objects.get(pk=pk)
+    print("paper", paper)
     if request.user == paper.author or request.user.groups.filter(
             name='reviewer').exists() or request.user.is_staff:
         document = UploadedFile.objects.get(pk=item)
-
-        file_path = document.file.name
-
-        if not os.path.exists(file_path):
-            unquoted_path = unquote(file_path)
-            if os.path.exists(unquoted_path):
-                file_path = unquoted_path
-
-        return serve(request, os.path.basename(file_path), os.path.dirname(file_path))
+        print("document", document)
+        filepath = str(BASE_DIR)+document.file.url
+        print("filepath", unquote(filepath))
+        return serve(request, os.path.basename(unquote(filepath)), os.path.dirname(unquote(filepath)))
     else:
         return redirect('paper-list')