X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/2093e5fc5be1b99b69dde50077134072d5de4de0..a802a933f53625f732e9d3807b4162e770c8aaf1:/apps/fileupload/views.py?ds=sidebyside diff --git a/apps/fileupload/views.py b/apps/fileupload/views.py index 89cc480f..cfaedc80 100644 --- a/apps/fileupload/views.py +++ b/apps/fileupload/views.py @@ -9,6 +9,8 @@ from django.utils.decorators import method_decorator from django.utils.encoding import force_unicode from django.views.decorators.vary import vary_on_headers from django.views.generic import FormView, RedirectView +from unidecode import unidecode + from .forms import UploadForm @@ -38,12 +40,11 @@ class JSONResponse(HttpResponse): class UploadViewMixin(object): def get_safe_path(self, filename=""): """Finds absolute filesystem path of the browsed dir of file. - + Makes sure it's inside MEDIA_ROOT. - + """ path = os.path.abspath(os.path.join(settings.MEDIA_ROOT, self.get_directory(), filename)) - # WTF how would that be possible? if not path.startswith(os.path.abspath(settings.MEDIA_ROOT)): raise Http404 if filename: @@ -133,11 +134,12 @@ class UploadView(UploadViewMixin, FormView): os.makedirs(path) data = [] for f in flist: + f.name = unidecode(f.name) with open(self.get_safe_path(f.name), 'w') as destination: for chunk in f.chunks(): destination.write(chunk) data.append({ - 'name': f.name, + 'name': f.name, 'url': self.get_url(f.name), 'thumbnail_url': thumbnail(self.get_directory() + f.name), 'delete_url': "%s?file=%s" % ( @@ -157,6 +159,9 @@ class UploadView(UploadViewMixin, FormView): class PackageView(UploadViewMixin, RedirectView): + # usage of RedirectView here is really really ugly + permanent = False + def dispatch(self, request, *args, **kwargs): self.object = self.get_object(request, *args, **kwargs) path = self.get_safe_path()