X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/5d9c33d00933597e218b732e3bd0bcbb55c4f371..32ee10aaf4c035a199a96c06bd2506befed5e17f:/src/cover/views.py diff --git a/src/cover/views.py b/src/cover/views.py index 02d642c4..302f5f52 100644 --- a/src/cover/views.py +++ b/src/cover/views.py @@ -1,15 +1,20 @@ # This file is part of FNP-Redakcja, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # +from hashlib import sha1 +from os import makedirs import os.path +import PIL.Image from django.conf import settings from django.contrib.auth.decorators import permission_required -from django.http import HttpResponse, HttpResponseRedirect, Http404 +from django.http import HttpResponse, HttpResponseRedirect, Http404, JsonResponse from django.shortcuts import get_object_or_404, render from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_POST from lxml import etree from librarian import RDFNS, DCNS +from librarian.cover import make_cover +from librarian.dcparser import BookInfo from documents.helpers import active_tab from documents.models import Book, Chunk from cover.models import Image @@ -17,7 +22,7 @@ from cover import forms from cover.utils import get_import_data -PREVIEW_SIZE = (216, 300) +PREVIEW_SIZE = (212, 300) def preview(request, book, chunk=None, rev=None): @@ -26,11 +31,14 @@ def preview(request, book, chunk=None, rev=None): If chunk and rev number are given, use version from given revision. If rev is not given, use publishable version. """ - from PIL import Image - from librarian.cover import make_cover - from librarian.dcparser import BookInfo + try: + chunk = Chunk.get(book, chunk) + except Chunk.DoesNotExist: + raise Http404 + + if chunk.book.cover and rev is None and not request.GET.get('width') and not request.GET.get('height'): + return HttpResponseRedirect(chunk.book.cover.url) - chunk = Chunk.get(book, chunk) if rev is not None: try: revision = chunk.at_revision(rev) @@ -44,20 +52,26 @@ def preview(request, book, chunk=None, rev=None): try: info = BookInfo.from_bytes(xml) - except: + except Exception as e: + print(e) return HttpResponseRedirect(os.path.join(settings.STATIC_URL, "img/sample_cover.png")) width = request.GET.get('width') width = int(width) if width else None height=request.GET.get('height') height = int(height) if height else None - cover = make_cover(info, width=width, height=height) - #cover = make_cover(info) + + if not (height or width): + width, height = PREVIEW_SIZE + + cover_class = request.GET.get('cover_class', 'default') + + kwargs = {} + if chunk.book.project is not None: + if chunk.book.project.logo_mono or chunk.book.project.logo: + kwargs['cover_logo'] = (chunk.book.project.logo_mono or chunk.book.project.logo).path + cover = make_cover(info, cover_class=cover_class, width=width, height=height, **kwargs) response = HttpResponse(content_type=cover.mime_type()) - if height or width: - size = (width, height) - else: - size = PREVIEW_SIZE - img = cover.image().resize(size, Image.ANTIALIAS) + img = cover.final_image() img.save(response, cover.format) if 'download' in request.GET: @@ -69,17 +83,11 @@ def preview(request, book, chunk=None, rev=None): @csrf_exempt @require_POST def preview_from_xml(request): - from hashlib import sha1 - from PIL import Image - from os import makedirs - from lxml import etree - from librarian.cover import make_cover - from librarian.dcparser import BookInfo - xml = request.POST['xml'] try: info = BookInfo.from_bytes(xml.encode('utf-8')) - except: + except Exception as e: + print(e) return HttpResponse(os.path.join(settings.STATIC_URL, "img/sample_cover.png")) coverid = sha1(etree.tostring(info.to_etree())).hexdigest() cover = make_cover(info) @@ -90,7 +98,7 @@ def preview_from_xml(request): except OSError: pass fname = os.path.join(cover_dir, "%s.%s" % (coverid, cover.ext())) - img = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS) + img = cover.image().resize(PREVIEW_SIZE, PIL.Image.ANTIALIAS) img.save(os.path.join(settings.MEDIA_ROOT, fname)) return HttpResponse(os.path.join(settings.MEDIA_URL, fname)) @@ -99,6 +107,22 @@ def preview_from_xml(request): def image(request, pk): img = get_object_or_404(Image, pk=pk) + if not request.accepts('text/html') and request.accepts('application/json') or request.GET.get('format') == 'json': + return JsonResponse({ + 'title': img.title, + 'author': img.author, + 'license_name': img.license_name, + 'license_url': img.license_url, + 'source_url': img.source_url, + 'attribution': img.attribution, + 'cut_left': img.cut_left, + 'cut_right': img.cut_right, + 'cut_top': img.cut_top, + 'cut_bottom': img.cut_bottom, + 'file': img.file.url, + 'use_file': img.use_file.url, + }) + if request.user.has_perm('cover.change_image'): if request.method == "POST": form = forms.ImageEditForm(request.POST, request.FILES, instance=img) @@ -126,9 +150,14 @@ def image_file(request, pk): @active_tab('cover') def image_list(request): + qs = Image.objects.all().order_by('-id') + only_unused = request.GET.get('unused') + if only_unused: + qs = qs.filter(book=None) return render(request, "cover/image_list.html", { - 'object_list': Image.objects.all(), + 'object_list': qs, 'can_add': request.user.has_perm('cover.add_image'), + 'only_unused': only_unused, }) @@ -161,7 +190,7 @@ def quick_import(request, pk): if url.startswith('%s://%s/' % ( request.scheme, request.get_host())): - cover_id = url.rsplit('/', 1)[-1] + cover_id = url.rstrip('/').rsplit('/', 1)[-1] cover = Image.objects.get(pk=cover_id) else: data = get_import_data(url)