update librarian

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

diff --git a/apps/cover/views.py b/apps/cover/views.py
index 2a21b5c..4a6e575 100644 (file)
--- a/apps/cover/views.py
+++ b/apps/cover/views.py
@@ -26,7 +26,7 @@ def preview(request, book, chunk=None, rev=None):
     If rev is not given, use publishable version.
     """
     from PIL import Image
     If rev is not given, use publishable version.
     """
     from PIL import Image

-    from librarian.cover import WLCover
+    from librarian.cover import DefaultEbookCover

     from librarian.dcparser import BookInfo
 
     chunk = Chunk.get(book, chunk)
     from librarian.dcparser import BookInfo
 
     chunk = Chunk.get(book, chunk)


@@ -45,8 +45,8 @@ 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"))
         info = BookInfo.from_string(xml)
     except:
         return HttpResponseRedirect(os.path.join(settings.STATIC_URL, "img/sample_cover.png"))

-    cover = WLCover(info)
-    response = HttpResponse(mimetype=cover.mime_type())
+    cover = DefaultEbookCover(info)
+    response = HttpResponse(content_type=cover.mime_type())

     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
     image.save(response, cover.format)
     return response
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
     image.save(response, cover.format)
     return response


@@ -59,7 +59,7 @@ def preview_from_xml(request):
     from PIL import Image
     from os import makedirs
     from lxml import etree
     from PIL import Image
     from os import makedirs
     from lxml import etree

-    from librarian.cover import WLCover
+    from librarian.cover import DefaultEbookCover

     from librarian.dcparser import BookInfo
 
     xml = request.POST['xml']
     from librarian.dcparser import BookInfo
 
     xml = request.POST['xml']


@@ -68,7 +68,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()
     except:
         return HttpResponse(os.path.join(settings.STATIC_URL, "img/sample_cover.png"))
     coverid = sha1(etree.tostring(info.to_etree())).hexdigest()

-    cover = WLCover(info)
+    cover = DefaultEbookCover(info)

 
     cover_dir = 'cover/preview'
     try:
 
     cover_dir = 'cover/preview'
     try:


@@ -87,7 +87,7 @@ def image(request, pk):
 
     if request.user.has_perm('cover.change_image'):
         if request.method == "POST":
 
     if request.user.has_perm('cover.change_image'):
         if request.method == "POST":

-            form = forms.ImageEditForm(request.POST, instance=image)
+            form = forms.ImageEditForm(request.POST, request.FILES, instance=image)

             if form.is_valid():
                 form.save()
                 return HttpResponseRedirect(image.get_absolute_url())
             if form.is_valid():
                 form.save()
                 return HttpResponseRedirect(image.get_absolute_url())


@@ -125,7 +125,7 @@ def add_image(request):
             if ff.is_valid():
                 form = forms.ImageAddForm(ff.cleaned_data)
         else:
             if ff.is_valid():
                 form = forms.ImageAddForm(ff.cleaned_data)
         else:

-            form = forms.ImageAddForm(request.POST)
+            form = forms.ImageAddForm(request.POST, request.FILES)

             if form.is_valid():
                 obj = form.save()
                 return HttpResponseRedirect(obj.get_absolute_url())
             if form.is_valid():
                 obj = form.save()
                 return HttpResponseRedirect(obj.get_absolute_url())