From 0bda5e48672b8e7b129272b9a23b8b80e8699c93 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20St=C4=99pniowski?= Date: Thu, 18 Sep 2008 18:14:18 +0200 Subject: [PATCH] De-cruftified download_shelf view. --- apps/catalogue/views.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 1be05b442..a2bd34f63 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -209,34 +209,28 @@ def download_shelf(request, slug): be used for large dynamic PDF files. """ shelf = get_object_or_404(models.Tag, slug=slug, category='set') - - from StringIO import StringIO - - + # Create a ZIP archive temp = temp = tempfile.TemporaryFile() archive = zipfile.ZipFile(temp, 'w') for book in models.Book.tagged.with_all(shelf): if book.pdf_file: filename = book.pdf_file.path - print filename archive.write(filename, str('%s.pdf' % book.slug)) if book.odt_file: filename = book.odt_file.path - print filename archive.write(filename, str('%s.odt' % book.slug)) if book.txt_file: filename = book.txt_file.path - print filename archive.write(filename, str('%s.txt' % book.slug)) archive.close() response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed') response['Content-Disposition'] = 'attachment; filename=%s.zip' % shelf.sort_key response['Content-Length'] = temp.tell() + temp.seek(0) response.write(temp.read()) - return response -- 2.20.1