Added tag wolnelektury-0.9.1 for changeset fed64f1e09c1

[wolnelektury.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 58ef892..a2bd34f 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -209,35 +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')
     be used for large dynamic PDF files.                                        
     """
     shelf = get_object_or_404(models.Tag, slug=slug, category='set')

-    
+            

     # Create a ZIP archive
     # 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
     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
         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
         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()
     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()
     response['Content-Disposition'] = 'attachment; filename=%s.zip' % shelf.sort_key
     response['Content-Length'] = temp.tell()

-    print temp.tell()
+    

     temp.seek(0)
     temp.seek(0)

+    response.write(temp.read())

     return response
 
 
     return response