X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?a=blobdiff_plain;f=filex%2Fuploadhandler.py;h=7e57a369b4923324199e39274f17a1dac9ab8706;hb=5e547a8cc20ef2bd450b3b839564e56e99099cee;hp=ee34a91943842393479d187a2476083895d6b2c4;hpb=26afa69867c0d50f44e9e9468785b78fed2cbc47;p=qcg-portal.git diff --git a/filex/uploadhandler.py b/filex/uploadhandler.py index ee34a91..7e57a36 100644 --- a/filex/uploadhandler.py +++ b/filex/uploadhandler.py @@ -1,13 +1,10 @@ -from functools import wraps import os from django.core.files.uploadedfile import UploadedFile from django.core.files.uploadhandler import FileUploadHandler, StopUpload, StopFutureHandlers -from django.http import JsonResponse -from django.views.decorators.csrf import csrf_exempt, csrf_protect from filex.forms import HostPathForm -from filex.ftp import FTPOperation, FTPError +from filex.ftp import FTPOperation class FtpUploadHandler(FileUploadHandler): @@ -46,22 +43,3 @@ class FtpUploadHandler(FileUploadHandler): return UploadedFile(name=self.file_name, size=file_size, charset=self.charset, content_type=self.content_type, content_type_extra=self.content_type_extra) - - -def with_ftp_upload_handler(view_func): - @wraps(view_func) - def wrapped_view(request, *args, **kwargs): - request.upload_handlers = [FtpUploadHandler(request)] - - try: - return csrf_protect(view_func)(request, *args, **kwargs) - except FTPError as e: - status = 400 - if 'No such file or directory' in e.message: - status = 404 - elif 'Permission denied' in e.message: - status = 403 - - return JsonResponse({'error': e.message}, status=status) - - return csrf_exempt(wrapped_view)