X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f3339efe0d7ffa1199a113108c0e2f6f6b07afe2..a980dc9ed36f367a04dfdc56e277375d9cca1bd1:/apps/cover/views.py?ds=sidebyside diff --git a/apps/cover/views.py b/apps/cover/views.py index 19d81c22..0c29209c 100644 --- a/apps/cover/views.py +++ b/apps/cover/views.py @@ -1,15 +1,24 @@ -# 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.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.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) + def preview(request, book, chunk=None, rev=None): """Creates a cover image. @@ -31,8 +40,11 @@ def preview(request, book, chunk=None, rev=None): 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) @@ -51,7 +63,10 @@ def preview_from_xml(request): 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) @@ -66,32 +81,59 @@ def preview_from_xml(request): 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 - - html = urlopen(url).read() - match = re.search(r'Some rights reserved', html) - if match: - license_url = match.group(1) +@active_tab('cover') +def image(request, pk): + image = get_object_or_404(Image, pk=pk) - re_license = re.compile(r'http://creativecommons.org/licenses/([^/]*)/([^/]*)/.*') - m = re_license.match(license_url) - if m: - license_name = 'CC %s %s' % (m.group(1).upper(), m.group(2)) - - m = re.search(r'By ([^<]*)', html) - if m: - author = m.group(1) - - url_size = url.rstrip('/') + '/sizes/o/' - html = urlopen(url_size).read() - m = re.search(r'
\s*