De-cruftified download_shelf view.
authorMarek Stępniowski <marek@stepniowski.com>
Thu, 18 Sep 2008 16:14:18 +0000 (18:14 +0200)
committerMarek Stępniowski <marek@stepniowski.com>
Thu, 18 Sep 2008 16:14:18 +0000 (18:14 +0200)
apps/catalogue/views.py

index 1be05b4..a2bd34f 100644 (file)
@@ -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')
     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
     # 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
             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
             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()
             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())
     temp.seek(0)
     response.write(temp.read())
-
     return response
 
 
     return response