X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8885fd14f5f040eb3aa69f1d705856f99a1fa572..4fb23ed3c3396d23a37a718fc857ecc8b36b0c7f:/src/catalogue/views.py?ds=inline diff --git a/src/catalogue/views.py b/src/catalogue/views.py index af4d1e3b5..3c4a55fe9 100644 --- a/src/catalogue/views.py +++ b/src/catalogue/views.py @@ -23,7 +23,6 @@ from club.forms import 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 wolnelektury.utils import is_ajax from catalogue import constants from catalogue import forms @@ -39,9 +38,7 @@ staff_required = user_passes_test(lambda user: user.is_staff) def catalogue(request): return render(request, 'catalogue/catalogue.html', { 'books': Book.objects.filter(findable=True, parent=None), - 'pictures': Picture.objects.all(), 'collections': Collection.objects.filter(listed=True), - 'active_menu_item': 'all_works', }) @@ -54,7 +51,6 @@ def collection(request, slug): template_name = 'catalogue/collection.html' return render(request, template_name, { 'collection': coll, - 'active_menu_item': 'collections', }) @@ -195,22 +191,6 @@ class BookList(ObjectListView): return qs -class ArtList(ObjectListView): - template_name = 'catalogue/book_list.html' - dynamic_template_name = 'catalogue/dynamic_book_list.html' - title = gettext_lazy('Sztuka') - list_type = 'gallery' - - def get_queryset(self): - return Picture.objects.all() - - def search(self, qs): - term = self.request.GET.get('search') - if term: - qs = qs.filter(Q(title__icontains=term) | Q(tag_relations__tag__name_pl__icontains=term)).distinct() - return qs - - class LiteratureView(BookList): def get_suggested_tags(self, queryset): tags = list(get_top_level_related_tags([])) @@ -228,14 +208,6 @@ class AudiobooksView(LiteratureView): return Book.objects.filter(findable=True, media__type='mp3').distinct() -class GalleryView(ArtList): - def get_suggested_tags(self, queryset): - return Tag.objects.usage_for_queryset( - queryset, - counts=True - ).exclude(pk__in=[t.id for t in self.ctx['tags']]).order_by('-count') - - class TaggedObjectList(BookList): def analyse(self): super().analyse() @@ -253,6 +225,8 @@ class TaggedObjectList(BookList): t for t in self.ctx['tags'] if t is not self.ctx['main_tag'] ] + if len(self.ctx['tags']) == 1 and self.ctx['main_tag'].category == 'author': + self.ctx['translation_list'] = self.ctx['main_tag'].book_set.all() def get_queryset(self): qs = Book.tagged.with_all(self.ctx['work_tags']).filter(findable=True) @@ -311,42 +285,30 @@ class TaggedObjectList(BookList): -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] - +def object_list(request, objects, list_type='books'): related_tag_lists = [] - if related_tags: - related_tag_lists.append(related_tags) - else: + if True: related_tag_lists.append( Tag.objects.usage_for_queryset( objects, counts=True - ).exclude(category='set').exclude(pk__in=tag_ids)) + ).exclude(category='set')) 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) + ).exclude(name='') ) - if not (extra and extra.get('theme_is_set')): - if fragments is None: - if list_type == 'gallery': - fragments = PictureArea.objects.filter(picture__in=objects) - else: - fragments = Fragment.objects.filter(book__in=objects) + if True: + 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) + ).filter(category='theme') .only('name', 'sort_key', 'category', 'slug')) if isinstance(objects, QuerySet): objects = prefetch_relations(objects, 'author') - categories = split_tags(*related_tag_lists) suggest = [] @@ -355,36 +317,13 @@ def object_list(request, objects, fragments=None, related_tags=None, tags=None, objects = list(objects) - if not objects and len(tags) == 1 and list_type == 'books': - if PictureArea.tagged.with_any(tags).exists() or Picture.tagged.with_any(tags).exists(): - return redirect('tagged_object_list_gallery', '/'.join(tag.url_chunk for tag in tags)) - - if len(objects) > 3: - best = random.sample(objects, 3) - else: - best = objects - result = { 'object_list': objects, - 'categories': categories, 'suggest': suggest, 'list_type': list_type, - 'tags': tags, - 'main_tag': tags[0] if tags else None, - - 'formats_form': forms.DownloadFormatsForm(), - 'best': best, - 'active_menu_item': list_type, } - if extra: - result.update(extra) - has_theme = any(((theme := x).category == 'theme' for x in tags)) - if has_theme: - result['main_tag'] = theme - template = 'catalogue/theme_detail.html' - else: - template = 'catalogue/author_detail.html' + template = 'catalogue/author_detail.html' return render( request, template, result, @@ -425,74 +364,8 @@ def analyse_tags(request, tag_str): return tags -def theme_list(request, tags, list_type): - shelf_tags = [tag for tag in tags if tag.category == 'set'] - fragment_tags = [tag for tag in tags if tag.category != 'set'] - if list_type == 'gallery': - fragments = PictureArea.tagged.with_all(fragment_tags) - else: - fragments = Fragment.tagged.with_all(fragment_tags) - - if shelf_tags: - # 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(): - return redirect('tagged_object_list_gallery', '/'.join(tag.url_chunk for tag in tags)) - - return object_list(request, fragments, tags=tags, list_type=list_type, extra={ - 'theme_is_set': True, - 'active_menu_item': 'theme', - }) - - def tagged_object_list(request, tags, list_type): - if list_type in ('books', 'audiobooks'): - return TaggedObjectList.as_view()(request, tags=tags) - - try: - tags = analyse_tags(request, tags) - except ResponseInstead as e: - return e.response - - if list_type == 'gallery' and any(tag.category == 'set' for tag in tags): - raise Http404 - - if any(tag.category in ('theme', 'thing') for tag in tags): - return theme_list(request, tags, list_type=list_type) - - if list_type == 'books': - books = Book.tagged.with_all(tags) - - 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).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(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() - ), - } - } - else: - raise Http404 - - return object_list(request, tags=tags, list_type=list_type, **params) + return TaggedObjectList.as_view()(request, tags=tags) def book_fragments(request, slug, theme_slug): @@ -509,7 +382,6 @@ def book_fragments(request, slug, theme_slug): 'book': book, 'theme': theme, 'fragments': fragments, - 'active_menu_item': 'books', }) @@ -527,7 +399,6 @@ def book_detail(request, slug): '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': Club.objects.first() if book.preview else None, 'donation_form': DonationStep1Form(), }) @@ -548,7 +419,10 @@ def book_text(request, slug): 'book': book, 'extra_info': book.get_extra_info_json(), 'book_text': book_text, - 'inserts': DynamicTextInsert.get_all(request) + 'inserts': DynamicTextInsert.get_all(request), + + 'club': Club.objects.first(), + 'donation_form': DonationStep1Form(), }) @@ -668,7 +542,6 @@ def tag_catalogue(request, category): 'best': best, 'title': constants.CATEGORIES_NAME_PLURAL[category], 'whole_category': constants.WHOLE_CATEGORY[category], - 'active_menu_item': 'theme' if category == 'theme' else None, }) @@ -684,7 +557,6 @@ def collections(request): return render(request, template_name, { 'objects': objects, 'best': best, - 'active_menu_item': 'collections' })