import random
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.core.urlresolvers import reverse
+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.views.decorators.cache import never_cache
from ajaxable.utils import AjaxableFormView
-from club.models import Membership
+from club.forms import ScheduleForm
+from club.models import Club, Membership
+from annoy.models import DynamicTextInsert
from pdcounter import views as pdcounter_views
from picture.models import Picture, PictureArea
-from ssify import ssi_included, ssi_expect, SsiVariable as Var
from catalogue import constants
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
-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 collection(request, slug):
coll = get_object_or_404(Collection, slug=slug)
- return render(request, 'catalogue/collection.html', {'collection': coll})
+ return render(request, 'catalogue/collection.html', {
+ '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 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')
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:
})
+@never_cache
def book_detail(request, slug):
try:
book = Book.objects.get(slug=slug)
return render(
request,
- 'catalogue/book_detail.html',
+ 'catalogue/2021/book_detail.html' if request.EXPERIMENTS['layout'] == 'new' else 'catalogue/book_detail.html',
{
'book': book,
'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,
+
+ 'EXPERIMENTS_SWITCHABLE_layout': True,
})
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(tag.description)
-def embargo_link(request, format_, slug):
+@never_cache
+def embargo_link(request, key, format_, slug):
book = get_object_or_404(Book, slug=slug)
if format_ not in Book.formats:
raise Http404
+ if key != book.preview_key:
+ raise Http404
media_file = book.get_media(format_)
if not book.preview:
return HttpResponseRedirect(media_file.url)
- if not Membership.is_active_for(request.user):
- return HttpResponseRedirect(book.get_absolute_url())
return HttpResponse(media_file, content_type=constants.EBOOK_CONTENT_TYPES[format_])
def validate_object(self, obj, request):
book = obj
- if book.preview and not Membership_is_active_for(request.user):
+ if book.preview and not Membership.is_active_for(request.user):
return HttpResponseRedirect(book.get_absolute_url())
return super(CustomPDFFormView, self).validate_object(obj, request)
return obj.pretty_title()
-####
-# Includes
-####
-
-
-@ssi_included
-def book_mini(request, pk, with_link=True):
- # book = get_object_or_404(Book, pk=pk)
- try:
- book = Book.objects.only('cover_thumb', 'title', 'language', 'slug').get(pk=pk)
- except Book.DoesNotExist:
- raise Http404
- return render(request, 'catalogue/book_mini_box.html', {
- 'book': book,
- 'no_link': not with_link,
- })
-
-
-@ssi_included(get_ssi_vars=lambda pk: (lambda ipk: (
- ('ssify.get_csrf_token',),
- ('social_tags.likes_book', (ipk,)),
- ('social_tags.book_shelf_tags', (ipk,)),
- ))(ssi_expect(pk, int)))
-def book_short(request, pk):
- book = get_object_or_404(Book, pk=pk)
-
- return render(request, 'catalogue/book_short.html', {
- 'book': book,
- })
-
-
-@ssi_included(
- get_ssi_vars=lambda pk: book_short.get_ssi_vars(pk) +
- (lambda ipk: (
- ('social_tags.choose_cite', [ipk]),
- ('catalogue_tags.choose_fragment', [ipk], {
- 'unless': Var('social_tags.choose_cite', [ipk])}),
- ))(ssi_expect(pk, int)))
-def book_wide(request, pk):
- book = get_object_or_404(Book, pk=pk)
-
- return render(request, 'catalogue/book_wide.html', {
- 'book': book,
- })
-
-
-@ssi_included
-def fragment_short(request, pk):
- fragment = get_object_or_404(Fragment, pk=pk)
- return render(request, 'catalogue/fragment_short.html', {'fragment': fragment})
-
-
-@ssi_included
-def fragment_promo(request, pk):
- fragment = get_object_or_404(Fragment, pk=pk)
- return render(request, 'catalogue/fragment_promo.html', {'fragment': fragment})
-
-
-@ssi_included
-def tag_box(request, pk):
- tag = get_object_or_404(Tag, pk=pk)
- assert tag.category != 'set'
-
- return render(request, 'catalogue/tag_box.html', {
- 'tag': tag,
- })
-
-
-@ssi_included
-def collection_box(request, pk):
- collection = get_object_or_404(Collection, pk=pk)
-
- return render(request, 'catalogue/collection_box.html', {
- 'collection': collection,
- })
-
-
def tag_catalogue(request, category):
if category == 'theme':
tags = Tag.objects.usage_for_model(
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', {
'objects': objects,
'best': best,
+ 'active_menu_item': 'collections'
})
def get_isbn(request, book_format, slug):
book = Book.objects.get(slug=slug)
- return HttpResponse(book.extra_info.get('isbn_%s' % book_format))
+ return HttpResponse(book.get_extra_info_json().get('isbn_%s' % book_format))
fnp / wolnelektury.git / blobdiff