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

fix: polish char file names handling

Author: fkula5

papers/models.py

@@ -1,11 +1,12 @@
+import os
+import re
 from django.contrib.auth.models import User
 from django.db import models
 from django.db.models.signals import pre_delete
 from django.utils import timezone
 import textwrap
-import unicodedata
-import os
-import re
+
+from django.utils.text import slugify
 
 
 class NotificationPeriod(models.Model):
@@ -66,11 +67,15 @@ class CoAuthor(models.Model):
 
 def paper_directory_path(instance, filename):
     name, ext = os.path.splitext(filename)
-    name = unicodedata.normalize('NFD', name)
-    name = re.sub(r'[^\w\s-]', '', name, flags=re.ASCII)
-    name = re.sub(r'\s+', '_', name).strip('_')
-    name = textwrap.shorten(name, width=100, placeholder='') or 'file'
-    return f'paper_files/paperNo.{instance.paper.pk}/{name}{ext}'
+    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()}'
+
 
 class UploadedFile(models.Model):
     paper = models.ForeignKey(Paper, on_delete=models.CASCADE)
@@ -183,4 +188,4 @@ def delete_file_with_object(instance, **kwargs):
     instance.file.delete()
 
 
-pre_delete.connect(delete_file_with_object, sender=UploadedFile)
+pre_delete.connect(delete_file_with_object, sender=UploadedFile)

papers/views.py

@@ -1,3 +1,5 @@
+from email.utils import unquote
+
 from braces.views import CsrfExemptMixin
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
@@ -14,7 +16,6 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic import ListView, DetailView, CreateView, UpdateView, DeleteView, TemplateView
 from django.views.static import serve
-from urllib.parse import unquote
 from StronaProjektyKol.settings import SITE_NAME, BASE_DIR, SITE_ADMIN_MAIL
 from .filters import PaperFilter
 from .forms import *
@@ -126,8 +127,15 @@ def paper_file_download(request, pk, item):
     if request.user == paper.author or request.user.groups.filter(
             name='reviewer').exists() or request.user.is_staff:
         document = UploadedFile.objects.get(pk=item)
-        filepath =  document.file.path
-        return serve(request, os.path.basename(filepath), os.path.dirname(filepath))
+
+        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))
     else:
         return redirect('paper-list')
 
@@ -529,4 +537,4 @@ def userReviewShow(request, **kwargs):
         else:
             return render(request, template_name='papers/review_not_found.html')
     else:
-        return redirect('reviewDetail', review.pk)
+        return redirect('reviewDetail', review.pk)