#
from collections import OrderedDict
import random
+import re
+from urllib.parse import quote_plus
from django.conf import settings
-from django.http.response import HttpResponseForbidden
from django.template.loader import render_to_string
from django.shortcuts import get_object_or_404, render, redirect
from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
from django.urls import reverse
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
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import gettext as _, gettext_lazy
from django.views.decorators.cache import never_cache
from ajaxable.utils import AjaxableFormView
-from club.models import Membership
+from club.forms import ScheduleForm, DonationStep1Form
+from club.models import Club
+from annoy.models import DynamicTextInsert
from pdcounter import views as pdcounter_views
from picture.models import Picture, PictureArea
from catalogue import constants
from catalogue.models import Book, Collection, Tag, Fragment
from catalogue.utils import split_tags
from catalogue.models.tag import prefetch_relations
-from wolnelektury.utils import is_crawler
staff_required = user_passes_test(lambda user: user.is_staff)
def catalogue(request):
return render(request, 'catalogue/catalogue.html', {
- 'books': Book.objects.filter(parent=None),
+ 'books': Book.objects.filter(findable=True, parent=None),
'pictures': Picture.objects.all(),
- 'collections': Collection.objects.all(),
+ 'collections': Collection.objects.filter(listed=True),
'active_menu_item': 'all_works',
})
def daisy_list(request):
+ if request.EXPERIMENTS['layout'].value:
+ return object_list(request, Book.objects.filter(media__type='daisy'))
return book_list(request, Q(media__type='daisy'), template_name='catalogue/daisy_list.html')
def collection(request, slug):
coll = get_object_or_404(Collection, slug=slug)
- return render(request, 'catalogue/collection.html', {'collection': coll})
+ if request.EXPERIMENTS['layout'].value:
+ template_name = 'catalogue/2022/collection.html'
+ else:
+ template_name = 'catalogue/collection.html'
+ return render(request, template_name, {
+ 'collection': coll,
+ 'active_menu_item': 'collections',
+ })
def differentiate_tags(request, tags, ambiguous_slugs):
})
return render(
request,
- 'catalogue/differentiate_tags.html', {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]})
+ 'catalogue/differentiate_tags.html',
+ {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]}
+ )
-def object_list(request, objects, fragments=None, related_tags=None, tags=None, list_type='books', extra=None):
+def object_list(request, objects, fragments=None, related_tags=None, tags=None,
+ list_type='books', extra=None):
if not tags:
tags = []
tag_ids = [tag.pk for tag in tags]
related_tag_lists.append(related_tags)
else:
related_tag_lists.append(
- Tag.objects.usage_for_queryset(objects, counts=True).exclude(category='set').exclude(pk__in=tag_ids))
+ Tag.objects.usage_for_queryset(
+ objects, counts=True
+ ).exclude(category='set').exclude(pk__in=tag_ids))
+ if request.user.is_authenticated:
+ related_tag_lists.append(
+ Tag.objects.usage_for_queryset(
+ objects, counts=True
+ ).filter(
+ user=request.user
+ ).exclude(name='').exclude(pk__in=tag_ids)
+ )
if not (extra and extra.get('theme_is_set')):
if fragments is None:
if list_type == 'gallery':
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)
+ suggest = []
+ for c in ['set', 'author', 'epoch', 'kind', 'genre']:
+ suggest.extend(sorted(categories[c], key=lambda t: -t.count)[:3])
objects = list(objects)
result = {
'object_list': objects,
'categories': categories,
+ 'suggest': suggest,
'list_type': list_type,
'tags': tags,
+ 'main_tag': tags[0],
'formats_form': forms.DownloadFormatsForm(),
'best': best,
}
if extra:
result.update(extra)
+
+ if request.EXPERIMENTS['layout'].value:
+ has_theme = any(((theme := x).category == 'theme' for x in tags))
+ if has_theme:
+ result['main_tag'] = theme
+ template = 'catalogue/2022/theme_detail.html'
+ else:
+ template = 'catalogue/2022/author_detail.html'
+ else:
+ template = 'catalogue/tagged_object_list.html'
+
return render(
- request,
- 'catalogue/tagged_object_list.html', result,
+ request, template, result,
)
def literature(request):
- books = Book.objects.filter(parent=None)
+ books = Book.objects.filter(parent=None, findable=True)
return object_list(request, books, related_tags=get_top_level_related_tags([]))
def audiobooks(request):
- audiobooks = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct()
+ audiobooks = Book.objects.filter(findable=True, media__type__in=('mp3', 'ogg')).distinct()
return object_list(request, audiobooks, list_type='audiobooks', extra={
- 'daisy': Book.objects.filter(media__type='daisy').distinct(),
+ 'daisy': Book.objects.filter(findable=True, media__type='daisy').distinct(),
})
chunks = tag_str.split('/')
if len(chunks) == 2 and chunks[0] == 'autor':
raise ResponseInstead(pdcounter_views.author_detail(request, chunks[1]))
- else:
- raise Http404
+ raise Http404
except Tag.MultipleObjectsReturned as e:
# Ask the user to disambiguate
raise ResponseInstead(differentiate_tags(request, e.tags, e.ambiguous_slugs))
# TODO: Pictures on shelves not supported yet.
books = Book.tagged.with_all(shelf_tags).order_by()
fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books))
+ elif list_type == 'books':
+ fragments = fragments.filter(book__findable=True)
if not fragments and len(tags) == 1 and list_type == 'books':
if PictureArea.tagged.with_any(tags).exists() or Picture.tagged.with_any(tags).exists():
except ResponseInstead as e:
return e.response
- if is_crawler(request) and len(tags) > 1:
- return HttpResponseForbidden('address removed from crawling. check robots.txt')
-
if list_type == 'gallery' and any(tag.category == 'set' for tag in tags):
raise Http404
if any(tag.category == 'set' for tag in tags):
params = {'objects': books}
else:
+ books = books.filter(findable=True)
params = {
- 'objects': Book.tagged_top_level(tags),
+ 'objects': Book.tagged_top_level(tags).filter(findable=True),
'fragments': Fragment.objects.filter(book__in=books),
'related_tags': get_top_level_related_tags(tags),
}
elif list_type == 'gallery':
params = {'objects': Picture.tagged.with_all(tags)}
elif list_type == 'audiobooks':
- audiobooks = Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct()
+ audiobooks = Book.objects.filter(findable=True, media__type__in=('mp3', 'ogg')).distinct()
params = {
'objects': Book.tagged.with_all(tags, audiobooks),
'extra': {
- 'daisy': Book.tagged.with_all(tags, audiobooks.filter(media__type='daisy').distinct()),
+ 'daisy': Book.tagged.with_all(
+ tags, audiobooks.filter(media__type='daisy').distinct()
+ ),
}
}
else:
fragments = Fragment.tagged.with_all([theme]).filter(
Q(book=book) | Q(book__ancestor=book))
+ if request.EXPERIMENTS['layout'].value:
+ template_name = 'catalogue/2022/book_fragments.html'
+ else:
+ template_name = 'catalogue/book_fragments.html'
+
return render(
request,
- 'catalogue/book_fragments.html',
+ template_name,
{
'book': book,
'theme': theme,
except Book.DoesNotExist:
return pdcounter_views.book_stub_detail(request, slug)
+ new_layout = request.EXPERIMENTS['layout']
+
return render(
request,
- 'catalogue/book_detail.html',
+ 'catalogue/2022/book_detail.html' if new_layout.value else 'catalogue/book_detail.html',
{
'book': book,
+ 'accessible': book.is_accessible_to(request.user),
'book_children': book.children.all().order_by('parent_number', 'sort_key'),
'active_menu_item': 'books',
+ 'club_form': ScheduleForm() if book.preview else None,
+ 'club': Club.objects.first() if book.preview else None,
+ 'donation_form': DonationStep1Form(),
+
+ 'EXPERIMENTS_SWITCHABLE_layout': True,
})
if not book.has_media('mp3'):
raise Http404
- audiobooks, projects = book.get_audiobooks()
+ audiobooks, projects, total_duration = book.get_audiobooks()
return render(
request,
def book_text(request, slug):
book = get_object_or_404(Book, slug=slug)
- if book.preview and not Membership.is_active_for(request.user):
+ if not book.is_accessible_to(request.user):
return HttpResponseRedirect(book.get_absolute_url())
if not book.has_html_file():
raise Http404
- return render(request, 'catalogue/book_text.html', {'book': book})
+ with book.html_file.open('r') as f:
+ book_text = f.read()
+
+ return render(request, 'catalogue/book_text.html', {
+ 'book': book,
+ 'book_text': book_text,
+ 'inserts': DynamicTextInsert.get_all(request)
+ })
# =========
exception = pprint.pformat(info[1])
tb = '\n'.join(traceback.format_tb(info[2]))
return HttpResponse(
- _("An error occurred: %(exception)s\n\n%(tb)s") % {'exception': exception, 'tb': tb},
- mimetype='text/plain')
+ _("An error occurred: %(exception)s\n\n%(tb)s") % {
+ 'exception': exception, 'tb': tb
+ },
+ content_type='text/plain'
+ )
return HttpResponse(_("Book imported successfully"))
- else:
- return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
+ return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
# info views for API
return HttpResponse(media_file, content_type=constants.EBOOK_CONTENT_TYPES[format_])
-def download_zip(request, format, slug=None):
- if format in Book.ebook_formats:
- url = Book.zip_format(format)
- elif format in ('mp3', 'ogg') and slug is not None:
+def download_zip(request, file_format=None, media_format=None, slug=None):
+ if file_format:
+ url = Book.zip_format(file_format)
+ elif media_format and slug is not None:
book = get_object_or_404(Book, slug=slug)
- url = book.zip_audiobooks(format)
+ url = book.zip_audiobooks(media_format)
else:
raise Http404('No format specified for zip package')
- return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
+ return HttpResponseRedirect(quote_plus(settings.MEDIA_URL + url, safe='/?='))
class CustomPDFFormView(AjaxableFormView):
form_class = forms.CustomPDFForm
- title = ugettext_lazy('Download custom PDF')
- submit = ugettext_lazy('Download')
+ title = gettext_lazy('Download custom PDF')
+ submit = gettext_lazy('Download')
template = 'catalogue/custom_pdf_form.html'
honeypot = True
def validate_object(self, obj, request):
book = obj
- if book.preview and not Membership_is_active_for(request.user):
+ if not book.is_accessible_to(request.user):
return HttpResponseRedirect(book.get_absolute_url())
return super(CustomPDFFormView, self).validate_object(obj, request)
else:
best = described_tags
- return render(request, 'catalogue/tag_catalogue.html', {
+ if request.EXPERIMENTS['layout'].value:
+ template_name = 'catalogue/2022/tag_catalogue.html'
+ else:
+ template_name = 'catalogue/tag_catalogue.html'
+
+ return render(request, template_name, {
'tags': tags,
'best': best,
'title': constants.CATEGORIES_NAME_PLURAL[category],
def collections(request):
- objects = Collection.objects.all()
+ objects = Collection.objects.filter(listed=True)
if len(objects) > 3:
- best = random.sample(list(objects), 3)
+ best = random.sample(list(objects), 4)
else:
best = objects
- return render(request, 'catalogue/collections.html', {
+ if request.EXPERIMENTS['layout'].value:
+ template_name = 'catalogue/2022/collections.html'
+ else:
+ template_name = 'catalogue/collections.html'
+
+ return render(request, template_name, {
'objects': objects,
'best': best,
+ 'active_menu_item': 'collections'
})
fnp / wolnelektury.git / blobdiff