X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/88fd4555db2f2a3e5a7b4ccc81edb008dc434596..1d5891fb132659113423705d8d8c982144ef7a8c:/src/catalogue/views.py?ds=inline diff --git a/src/catalogue/views.py b/src/catalogue/views.py index 81d0a02b8..a247746d0 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -12,7 +12,7 @@ from django.template.loader import render_to_string from django.shortcuts import render_to_response, get_object_or_404, render, redirect from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect, JsonResponse from django.core.urlresolvers import reverse -from django.db.models import Q +from django.db.models import Q, QuerySet from django.contrib.auth.decorators import login_required, user_passes_test from django.utils.http import urlquote_plus from django.utils import translation @@ -29,6 +29,7 @@ from catalogue import forms from catalogue.helpers import get_top_level_related_tags from catalogue.models import Book, Collection, Tag, Fragment from catalogue.utils import split_tags +from catalogue.models.tag import prefetch_relations staff_required = user_passes_test(lambda user: user.is_staff) @@ -103,7 +104,10 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, else: fragments = Fragment.objects.filter(book__in=objects) related_tag_lists.append( - Tag.objects.usage_for_queryset(fragments, counts=True).filter(category='theme').exclude(pk__in=tag_ids)) + Tag.objects.usage_for_queryset(fragments, counts=True).filter(category='theme').exclude(pk__in=tag_ids) + .only('name', 'sort_key', 'category', 'slug')) + if isinstance(objects, QuerySet): + objects = prefetch_relations(objects, 'author') categories = split_tags(*related_tag_lists) @@ -282,44 +286,13 @@ def book_detail(request, slug): }, context_instance=RequestContext(request)) -def get_audiobooks(book): - ogg_files = {} - for m in book.media.filter(type='ogg').order_by().iterator(): - ogg_files[m.name] = m - - audiobooks = [] - have_oggs = True - projects = set() - for mp3 in book.media.filter(type='mp3').iterator(): - # ogg files are always from the same project - meta = mp3.extra_info - project = meta.get('project') - if not project: - # temporary fallback - project = u'CzytamySłuchając' - - projects.add((project, meta.get('funded_by', ''))) - - media = {'mp3': mp3} - - ogg = ogg_files.get(mp3.name) - if ogg: - media['ogg'] = ogg - else: - have_oggs = False - audiobooks.append(media) - - projects = sorted(projects) - return audiobooks, projects, have_oggs - - # używane w publicznym interfejsie def player(request, slug): book = get_object_or_404(Book, slug=slug) if not book.has_media('mp3'): raise Http404 - audiobooks, projects, have_oggs = get_audiobooks(book) + audiobooks, projects = book.get_audiobooks() return render_to_response('catalogue/player.html', { 'book': book, @@ -361,7 +334,14 @@ def _no_diacritics_regexp(query): def unicode_re_escape(query): """ Unicode-friendly version of re.escape """ - return re.sub(r'(?u)(\W)', r'\\\1', query) + s = list(query) + for i, c in enumerate(query): + if re.match(r'(?u)(\W)', c) and re.match(r'[\x00-\x7e]', c): + if c == "\000": + s[i] = "\\000" + else: + s[i] = "\\" + c + return query[:0].join(s) def _word_starts_with(name, prefix): @@ -617,6 +597,7 @@ class CustomPDFFormView(AjaxableFormView): form_class = forms.CustomPDFForm title = ugettext_lazy('Download custom PDF') submit = ugettext_lazy('Download') + template = 'catalogue/custom_pdf_form.html' honeypot = True def __call__(self, *args, **kwargs): @@ -660,20 +641,9 @@ def book_mini(request, pk, with_link=True): ))(ssi_expect(pk, int))) def book_short(request, pk): book = get_object_or_404(Book, pk=pk) - stage_note, stage_note_url = book.stage_note() - audiobooks, projects, have_oggs = get_audiobooks(book) return render(request, 'catalogue/book_short.html', { 'book': book, - 'has_audio': book.has_media('mp3'), - 'main_link': book.get_absolute_url(), - 'parents': book.parents(), - 'tags': split_tags(book.tags.exclude(category__in=('set', 'theme'))), - 'show_lang': book.language_code() != settings.LANGUAGE_CODE, - 'stage_note': stage_note, - 'stage_note_url': stage_note_url, - 'audiobooks': audiobooks, - 'have_oggs': have_oggs, }) @@ -686,24 +656,17 @@ def book_short(request, pk): ))(ssi_expect(pk, int))) def book_wide(request, pk): book = get_object_or_404(Book, pk=pk) - stage_note, stage_note_url = book.stage_note() extra_info = book.extra_info - audiobooks, projects, have_oggs = get_audiobooks(book) return render(request, 'catalogue/book_wide.html', { 'book': book, - 'has_audio': book.has_media('mp3'), 'parents': book.parents(), 'tags': split_tags(book.tags.exclude(category__in=('set', 'theme'))), 'show_lang': book.language_code() != settings.LANGUAGE_CODE, - 'stage_note': stage_note, - 'stage_note_url': stage_note_url, 'main_link': reverse('book_text', args=[book.slug]) if book.html_file else None, 'extra_info': extra_info, 'hide_about': extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl'), - 'audiobooks': audiobooks, - 'have_oggs': have_oggs, }) @@ -731,10 +694,10 @@ def tag_box(request, pk): @ssi_included def collection_box(request, pk): - obj = get_object_or_404(Collection, pk=pk) + collection = get_object_or_404(Collection, pk=pk) return render(request, 'catalogue/collection_box.html', { - 'obj': obj, + 'collection': collection, }) @@ -773,3 +736,17 @@ def collections(request): 'objects': objects, 'best': best, }) + + +def ridero_cover(request, slug): + from librarian.cover import make_cover + wldoc = Book.objects.get(slug=slug).wldocument() + cover = make_cover(wldoc.book_info, width=980, bleed=20, format='PNG') + response = HttpResponse(content_type="image/png") + cover.save(response) + return response + + +def get_isbn(request, book_format, slug): + book = Book.objects.get(slug=slug) + return HttpResponse(book.extra_info.get('isbn_%s' % book_format))