X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/929f89d521e88b6c3657d3d98f731beca52c6357..9e91abcf885383cee41a2c4f11d4777b58acf1aa:/apps/catalogue/views.py?ds=inline

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 58ef8928f..1be05b442 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -210,34 +210,33 @@ def download_shelf(request, slug):
     """
     shelf = get_object_or_404(models.Tag, slug=slug, category='set')
     
+    from StringIO import StringIO
+    
+    
     # Create a ZIP archive
-    temp = tempfile.TemporaryFile()
+    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[:7]))
+            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[:7]))
+            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[:7]))
+            archive.write(filename, str('%s.txt' % book.slug))
     archive.close()
-
-    zf = zipfile.ZipFile(temp, 'r')
-    print zf.testzip()
-    print zf.namelist()
     
-    wrapper = FileWrapper(temp)
-    response = HttpResponse(wrapper, content_type='application/zip')
+    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()
-    print temp.tell()
     temp.seek(0)
+    response.write(temp.read())
+
     return response