- × -

+ - - -{% upload_js %} - - - - - - - - - - - - - - - -{% endblock %} + {% upload_js %} + + + + + + + + + + + + + + + diff --git a/fileupload/templatetags/minimal_upload_tags.py b/fileupload/templatetags/minimal_upload_tags.py new file mode 100644 index 0000000..f1b544f --- /dev/null +++ b/fileupload/templatetags/minimal_upload_tags.py @@ -0,0 +1,60 @@ +from django import template + +register = template.Library() + +@register.simple_tag +def upload_js(): + return """ + + + + +""" diff --git a/fileupload/tests.py b/fileupload/tests.py deleted file mode 100644 index 501deb7..0000000 --- a/fileupload/tests.py +++ /dev/null @@ -1,16 +0,0 @@ -""" -This file demonstrates writing tests using the unittest module. These will pass -when you run "manage.py test". - -Replace this with more appropriate tests for your application. -""" - -from django.test import TestCase - - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.assertEqual(1 + 1, 2) diff --git a/fileupload/urls.py b/fileupload/urls.py index e25eb11..05ef597 100644 --- a/fileupload/urls.py +++ b/fileupload/urls.py @@ -1,8 +1,10 @@ from django.conf.urls.defaults import * -from fileupload.views import PictureCreateView, PictureDeleteView +from fileupload.views import PictureCreateView, PictureDeleteView, MultiUploderView + urlpatterns = patterns('', (r'^new/$', PictureCreateView.as_view(), {}, 'upload-new'), + (r'^new/add/$', MultiUploderView.as_view(), {}, 'upload-add'), (r'^delete/(?P\d+)$', PictureDeleteView.as_view(), {}, 'upload-delete'), ) diff --git a/fileupload/views.py b/fileupload/views.py index 1747056..4062c3f 100644 --- a/fileupload/views.py +++ b/fileupload/views.py @@ -1,12 +1,13 @@ -from fileupload.models import Picture from django.views.generic import CreateView, DeleteView +from django.views.generic.base import View -from django.http import HttpResponse, HttpResponseRedirect +from django.http import HttpResponse, Http404 from django.utils import simplejson from django.core.urlresolvers import reverse - from django.conf import settings +from fileupload.models import Picture + def response_mimetype(request): if "application/json" in request.META['HTTP_ACCEPT']: return "application/json" @@ -19,12 +20,82 @@ class PictureCreateView(CreateView): def form_valid(self, form): self.object = form.save() f = self.request.FILES.get('file') - data = [{'name': f.name, 'url': settings.MEDIA_URL + "pictures/" + f.name.replace(" ", "_"), 'thumbnail_url': settings.MEDIA_URL + "pictures/" + f.name.replace(" ", "_"), 'delete_url': reverse('upload-delete', args=[self.object.id]), 'delete_type': "DELETE"}] + data = [{'name': f.name, 'url': settings.MEDIA_URL + "pictures/" + f.name.replace(" ", "_"), + 'thumbnail_url': settings.MEDIA_URL + "pictures/" + f.name.replace(" ", "_"), + 'delete_url': reverse('upload-delete', args=[self.object.id]), 'delete_type': "DELETE"}] response = JSONResponse(data, {}, response_mimetype(self.request)) response['Content-Disposition'] = 'inline; filename=files.json' return response +class MultiUploderView(View): + model = Picture + + def post(self, request, *args, **kwargs): + if request.FILES == None: + raise Http404("No objects uploaded") + file = request.FILES['file'] + + url = self.save_form(request, file, *args, **kwargs) + + result = [{'name': file.name, + 'size': file.size, + 'url': url, + 'thumbnail_url': url, + }, ] + + response_data = simplejson.dumps(result) + if "application/json" in request.META['HTTP_ACCEPT_ENCODING']: + mimetype = 'application/json' + else: + mimetype = 'text/plain' + return HttpResponse(response_data, mimetype=mimetype) + + def save_form(self, request, file, *args, **kwargs): + a = self.model() + a.creator = request.user + a.file.save(file.name, file) + a.save() + return a.file.url + + def get(self, request, *args, **kwargs): + """ + required to satisfy jquery upload get request + """ + return HttpResponse('Only POST accepted') + +# def get(self, request, *args, **kwargs): +# """ +# required to satisfy jquery upload get request for existing images +# """ +# try: +# recipe = Recipe.objects.get(id=self.kwargs['recipe_id']) +# except Recipe.DoesNotExist: +# raise Http404("Recipe does not exist, thus can't get images") +# +# # import ipdb; ipdb.set_trace() +# images = recipe.images.all() +# +# #generating json response array +# result = [] +# +# for image in images: +# result.append({"name":image.description, +# "size":image.file.size, +# "url":image.file.url, +# "thumbnail_url":image.file.url,}) +# +# response_data = simplejson.dumps(result) +# +# #checking for json data type +# #big thanks to Guy Shapiro +# if "application/json" in request.META['HTTP_ACCEPT_ENCODING']: +# mimetype = 'application/json' +# else: +# mimetype = 'text/plain' +# return HttpResponse(response_data, mimetype=mimetype) + + class PictureDeleteView(DeleteView): model = Picture @@ -44,6 +115,7 @@ def delete(self, request, *args, **kwargs): class JSONResponse(HttpResponse): """JSON response class.""" - def __init__(self,obj='',json_opts={},mimetype="application/json",*args,**kwargs): - content = simplejson.dumps(obj,**json_opts) - super(JSONResponse,self).__init__(content,mimetype,*args,**kwargs) + + def __init__(self, obj='', json_opts={}, mimetype="application/json", *args, **kwargs): + content = simplejson.dumps(obj, **json_opts) + super(JSONResponse, self).__init__(content, mimetype, *args, **kwargs) diff --git a/setup.py b/setup.py new file mode 100644 index 0000000..cac28bb --- /dev/null +++ b/setup.py @@ -0,0 +1,17 @@ +""" +django-jquery-file-upload +""" + +from setuptools import setup, find_packages + +setup( + name = "django-jquery-file-upload", + version = "0.0.1", + url = "", + license = "The MIT License (MIT)", + description = "A minimal django project containing a minimal app with a working jquery file upload form based on the work by Sebastian Tschan: http://aquantum-demo.appspot.com/file-upload", + author = 'Sebastian Tschan / Sigurd Gartmann', + packages = find_packages(), + package_dir = {'': '.'}, + install_requires = [], +)