raven

[redakcja.git] / apps / cover / views.py

diff --git a/apps/cover/views.py b/apps/cover/views.py
index 607d808..f493392 100644 (file)
--- a/apps/cover/views.py
+++ b/apps/cover/views.py
@@ -25,7 +25,7 @@ def preview(request, book, chunk=None, rev=None):
     If rev is not given, use publishable version.
     """
     from PIL import Image
-    from librarian.cover import DefaultEbookCover
+    from librarian.cover import make_cover
     from librarian.dcparser import BookInfo
 
     chunk = Chunk.get(book, chunk)
@@ -44,7 +44,7 @@ def preview(request, book, chunk=None, rev=None):
         info = BookInfo.from_string(xml)
     except:
         return HttpResponseRedirect(os.path.join(settings.STATIC_URL, "img/sample_cover.png"))
-    cover = DefaultEbookCover(info)
+    cover = make_cover(info)
     response = HttpResponse(content_type=cover.mime_type())
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
     image.save(response, cover.format)
@@ -58,7 +58,7 @@ def preview_from_xml(request):
     from PIL import Image
     from os import makedirs
     from lxml import etree
-    from librarian.cover import DefaultEbookCover
+    from librarian.cover import make_cover
     from librarian.dcparser import BookInfo
 
     xml = request.POST['xml']
@@ -67,7 +67,7 @@ def preview_from_xml(request):
     except:
         return HttpResponse(os.path.join(settings.STATIC_URL, "img/sample_cover.png"))
     coverid = sha1(etree.tostring(info.to_etree())).hexdigest()
-    cover = DefaultEbookCover(info)
+    cover = make_cover(info)
 
     cover_dir = 'cover/preview'
     try:
@@ -98,7 +98,7 @@ def image(request, pk):
         editable = False
 
     return render(request, "cover/image_detail.html", {
-        "object": image,
+        "object": Image.objects.get(id=image.id),
         "form": form,
         "editable": editable,
     })