X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/68b9d53fb10d3ab01c176801e09addb9c06ff7bb..ee77d43cb32edb0f8b838204e0583ab1a2757d3a:/apps/cover/views.py diff --git a/apps/cover/views.py b/apps/cover/views.py index 0f341ad7..bbcf28e5 100644 --- a/apps/cover/views.py +++ b/apps/cover/views.py @@ -1,12 +1,19 @@ -# 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 +from django.contrib.auth.decorators import permission_required from django.http import HttpResponse, HttpResponseRedirect, Http404 -from catalogue.models import Chunk -from django.views.decorators.http import require_POST +from django.shortcuts import get_object_or_404, render 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) @@ -17,8 +24,8 @@ 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. """ - import Image - from librarian.cover import WLCover + from PIL import Image + from librarian.cover import make_cover from librarian.dcparser import BookInfo chunk = Chunk.get(book, chunk) @@ -37,10 +44,10 @@ 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 = WLCover(info) - response = HttpResponse(mimetype=cover.mime_type()) - image = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS) - image.save(response, cover.format) + cover = make_cover(info) + response = HttpResponse(content_type=cover.mime_type()) + img = cover.image().resize(PREVIEW_SIZE, Image.ANTIALIAS) + img.save(response, cover.format) return response @@ -48,10 +55,10 @@ def preview(request, book, chunk=None, rev=None): @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.cover import make_cover from librarian.dcparser import BookInfo xml = request.POST['xml'] @@ -60,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 = WLCover(info) + cover = make_cover(info) cover_dir = 'cover/preview' try: @@ -68,41 +75,67 @@ 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)) -def flickr(request): - url = request.POST.get('flickr_url') - if url: - import re - from urllib2 import urlopen +@active_tab('cover') +def image(request, pk): + img = get_object_or_404(Image, pk=pk) - html = urlopen(url).read() - match = re.search(r'Some rights reserved', html) - try: - assert match - license_url = match.group(1) - re_license = re.compile(r'http://creativecommons.org/licenses/([^/]*)/([^/]*)/.*') - m = re_license.match(license_url) - assert m - license_name = 'CC %s %s' % (m.group(1).upper(), m.group(2)) - except AssertionError: - license_name = 'NIEZNANA LICENCJA' - - m = re.search(r'By ([^<]*)', html) - if m: - author = m.group(1) + if request.user.has_perm('cover.change_image'): + if request.method == "POST": + form = forms.ImageEditForm(request.POST, request.FILES, instance=img) + if form.is_valid(): + form.save() + return HttpResponseRedirect(img.get_absolute_url()) else: - author = "NIEZNANY AUTOR" - - url_size = url.rstrip('/') + '/sizes/o/' - html = urlopen(url_size).read() - m = re.search(r'
\s*