X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/ed5df159a03b0c3c0d17f9e7be8d925e9e73f669..8132fc186eb0c5fd02c86828c3a4735754296d02:/apps/cover/views.py

diff --git a/apps/cover/views.py b/apps/cover/views.py
index 25033c18..3f2c46fa 100644
--- 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)
@@ -41,13 +41,13 @@ def preview(request, book, chunk=None, rev=None):
     xml = revision.materialize().encode('utf-8')
 
     try:
-        info = BookInfo.from_string(xml)
+        info = BookInfo.from_bytes(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)
+    img = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
+    img.save(response, cover.format)
     return response
 
 
@@ -58,16 +58,16 @@ 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']
     try:
-        info = BookInfo.from_string(xml.encode('utf-8'))
+        info = BookInfo.from_bytes(xml.encode('utf-8'))
     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:
@@ -75,35 +75,40 @@ def preview_from_xml(request):
     except OSError:
         pass
     fname = os.path.join(cover_dir, "%s.%s" % (coverid, cover.ext()))
-    image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
-    image.save(os.path.join(settings.MEDIA_ROOT, fname))
+    img = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
+    img.save(os.path.join(settings.MEDIA_ROOT, fname))
     return HttpResponse(os.path.join(settings.MEDIA_URL, fname))
 
 
 @active_tab('cover')
 def image(request, pk):
-    image = get_object_or_404(Image, pk=pk)
+    img = get_object_or_404(Image, pk=pk)
 
     if request.user.has_perm('cover.change_image'):
         if request.method == "POST":
-            form = forms.ImageEditForm(request.POST, request.FILES, instance=image)
+            form = forms.ImageEditForm(request.POST, request.FILES, instance=img)
             if form.is_valid():
                 form.save()
-                return HttpResponseRedirect(image.get_absolute_url())
+                return HttpResponseRedirect(img.get_absolute_url())
         else:
-            form = forms.ImageEditForm(instance=image)
+            form = forms.ImageEditForm(instance=img)
         editable = True
     else:
-        form = forms.ReadonlyImageEditForm(instance=image)
+        form = forms.ReadonlyImageEditForm(instance=img)
         editable = False
 
     return render(request, "cover/image_detail.html", {
-        "object": Image.objects.get(id=image.id),
+        "object": Image.objects.get(id=img.id),
         "form": form,
         "editable": editable,
     })
 
 
+def image_file(request, pk):
+    img = get_object_or_404(Image, pk=pk)
+    return HttpResponseRedirect(img.file.url)
+
+
 @active_tab('cover')
 def image_list(request):
     return render(request, "cover/image_list.html", {