Editor update: fixes, additional logging

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

diff --git a/apps/cover/views.py b/apps/cover/views.py
index 29fd117..3d30a2a 100644 (file)
--- a/apps/cover/views.py
+++ b/apps/cover/views.py
@@ -1,22 +1,31 @@
-# Create your views here.
+# -*- coding: utf-8 -*-
+#
+# This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later.
+# Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
+#

 import os.path
 from django.conf import settings
 import os.path
 from django.conf import settings

-from django.http import HttpResponse, Http404
-from catalogue.models import Chunk
-from django.views.decorators.http import require_POST
+from django.contrib.auth.decorators import permission_required
+from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.shortcuts import get_object_or_404, render

 from django.views.decorators.csrf import csrf_exempt
 from django.views.decorators.csrf import csrf_exempt

-from django.shortcuts import render
+from django.views.decorators.http import require_POST
+from catalogue.helpers import active_tab
+from catalogue.models import Chunk
+from cover.models import Image
+from cover import forms

 
 
 PREVIEW_SIZE = (216, 300)
 
 
 
 PREVIEW_SIZE = (216, 300)
 

+

 def preview(request, book, chunk=None, rev=None):
     """Creates a cover image.
 
     If chunk and rev number are given, use version from given revision.
     If rev is not given, use publishable version.
     """
 def preview(request, book, chunk=None, rev=None):
     """Creates a cover image.
 
     If chunk and rev number are given, use version from given revision.
     If rev is not given, use publishable version.
     """

-    import Image
+    from PIL import Image

     from librarian.cover import WLCover
     from librarian.dcparser import BookInfo
 
     from librarian.cover import WLCover
     from librarian.dcparser import BookInfo
 


@@ -31,8 +40,11 @@ def preview(request, book, chunk=None, rev=None):
         if revision is None:
             raise Http404
     xml = revision.materialize().encode('utf-8')
         if revision is None:
             raise Http404
     xml = revision.materialize().encode('utf-8')

-    
-    info = BookInfo.from_string(xml)
+
+    try:
+        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())
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
     cover = WLCover(info)
     response = HttpResponse(mimetype=cover.mime_type())
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)


@@ -44,14 +56,17 @@ def preview(request, book, chunk=None, rev=None):
 @require_POST
 def preview_from_xml(request):
     from hashlib import sha1
 @require_POST
 def preview_from_xml(request):
     from hashlib import sha1

-    import Image
+    from PIL import Image

     from os import makedirs
     from lxml import etree
     from librarian.cover import WLCover
     from librarian.dcparser import BookInfo
 
     xml = request.POST['xml']
     from os import makedirs
     from lxml import etree
     from librarian.cover import WLCover
     from librarian.dcparser import BookInfo
 
     xml = request.POST['xml']

-    info = BookInfo.from_string(xml.encode('utf-8'))
+    try:
+        info = BookInfo.from_string(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 = WLCover(info)
 
     coverid = sha1(etree.tostring(info.to_etree())).hexdigest()
     cover = WLCover(info)
 


@@ -64,3 +79,61 @@ def preview_from_xml(request):
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
     image.save(os.path.join(settings.MEDIA_ROOT, fname))
     return HttpResponse(os.path.join(settings.MEDIA_URL, fname))
     image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS)
     image.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)
+
+    if request.user.has_perm('cover.change_image'):
+        if request.method == "POST":
+            form = forms.ImageEditForm(request.POST, instance=image)
+            if form.is_valid():
+                form.save()
+                return HttpResponseRedirect(image.get_absolute_url())
+        else:
+            form = forms.ImageEditForm(instance=image)
+        editable = True
+    else:
+        form = forms.ReadonlyImageEditForm(instance=image)
+        editable = False
+
+    return render(request, "cover/image_detail.html", {
+        "object": image,
+        "form": form,
+        "editable": editable,
+    })
+
+
+@active_tab('cover')
+def image_list(request):
+    objects = Image.objects.all()
+    enable_add = request.user.has_perm('cover.add_image')
+    return render(request, "cover/image_list.html", {
+        'object_list': Image.objects.all(),
+        'can_add': request.user.has_perm('cover.add_image'),
+    })
+
+
+@permission_required('cover.add_image')
+@active_tab('cover')
+def add_image(request):
+    form = ff = None
+    if request.method == 'POST':
+        if request.POST.get('form_id') == 'flickr':
+            ff = forms.FlickrForm(request.POST)
+            if ff.is_valid():
+                form = forms.ImageAddForm(ff.cleaned_data)
+        else:
+            form = forms.ImageAddForm(request.POST, request.FILES)
+            if form.is_valid():
+                obj = form.save()
+                return HttpResponseRedirect(obj.get_absolute_url())
+    if form is None:
+        form = forms.ImageAddForm()
+    if ff is None:
+        ff = forms.FlickrForm()
+    return render(request, 'cover/add_image.html', {
+            'form': form,
+            'ff': ff,
+        })