#
from collections import OrderedDict
import re
+import random
from django.conf import settings
from django.template import RequestContext
from django.template.loader import render_to_string
-from django.shortcuts import render_to_response, get_object_or_404, render
+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 pdcounter import models as pdcounter_models
from pdcounter import views as pdcounter_views
from picture.models import Picture, PictureArea
-from picture.views import picture_list_thumb
from ssify import ssi_included, ssi_expect, SsiVariable as V
from suggest.forms import PublishingSuggestForm
+from catalogue import constants
from catalogue import forms
from catalogue.helpers import get_top_level_related_tags
from catalogue import models
-from catalogue.utils import split_tags, MultiQuerySet, SortedMultiQuerySet
-from catalogue.templatetags.catalogue_tags import tag_list, collection_list
+from catalogue.utils import split_tags
staff_required = user_passes_test(lambda user: user.is_staff)
def catalogue(request, as_json=False):
- common_categories = ('author',)
- split_categories = ('epoch', 'genre', 'kind')
-
- categories = split_tags(
- get_top_level_related_tags(categories=common_categories),
- models.Tag.objects.usage_for_model(
- models.Fragment, counts=True).filter(category='theme'),
- models.Tag.objects.usage_for_model(
- Picture, counts=True).filter(category__in=common_categories),
- models.Tag.objects.usage_for_model(
- PictureArea, counts=True).filter(
- category='theme')
- )
- book_categories = split_tags(
- get_top_level_related_tags(categories=split_categories)
- )
- picture_categories = split_tags(
- models.Tag.objects.usage_for_model(
- Picture, counts=True).filter(
- category__in=split_categories),
- )
-
+ books = models.Book.objects.filter(parent=None).order_by('sort_key_author', 'sort_key')
+ pictures = Picture.objects.order_by('sort_key_author', 'sort_key')
collections = models.Collection.objects.all()
-
- def render_tag_list(tags):
- return render_to_string('catalogue/tag_list.html', tag_list(tags))
-
- def render_split(with_books, with_pictures):
- ctx = {}
- if with_books:
- ctx['books'] = render_tag_list(with_books)
- if with_pictures:
- ctx['pictures'] = render_tag_list(with_pictures)
- return render_to_string('catalogue/tag_list_split.html', ctx)
-
- output = {}
- output['theme'] = render_tag_list(categories.get('theme', []))
- for category in common_categories:
- output[category] = render_tag_list(categories.get(category, []))
- for category in split_categories:
- output[category] = render_split(
- book_categories.get(category, []),
- picture_categories.get(category, []))
-
- output['collections'] = render_to_string(
- 'catalogue/collection_list.html', collection_list(collections))
- if as_json:
- return JsonResponse(output)
- else:
- return render_to_response('catalogue/catalogue.html', locals(),
- context_instance=RequestContext(request))
-
-
-@ssi_included
-def catalogue_json(request):
- return catalogue(request, True)
+ return render(request, 'catalogue/catalogue.html', locals())
-def book_list(request, filter=None, get_filter=None,
- template_name='catalogue/book_list.html',
- nav_template_name='catalogue/snippets/book_list_nav.html',
- list_template_name='catalogue/snippets/book_list.html',
- context=None,
- ):
+def book_list(request, filter=None, get_filter=None, template_name='catalogue/book_list.html',
+ nav_template_name='catalogue/snippets/book_list_nav.html',
+ list_template_name='catalogue/snippets/book_list.html', context=None):
""" generates a listing of all books, optionally filtered with a test function """
if get_filter:
filter = get_filter()
books_nav.setdefault(tag.sort_key[0], []).append(tag)
rendered_nav = render_to_string(nav_template_name, locals())
rendered_book_list = render_to_string(list_template_name, locals())
- return render_to_response(template_name, locals(),
- context_instance=RequestContext(request))
+ return render_to_response(template_name, locals(), context_instance=RequestContext(request))
def audiobook_list(request):
- return book_list(request, Q(media__type='mp3') | Q(media__type='ogg'),
- template_name='catalogue/audiobook_list.html',
- list_template_name='catalogue/snippets/audiobook_list.html',
- )
+ books = models.Book.objects.filter(media__type__in=('mp3', 'ogg')).distinct().order_by(
+ 'sort_key_author', 'sort_key')
+ books = list(books)
+ if len(books) > 3:
+ best = random.sample(books, 3)
+ else:
+ best = books
+
+ daisy = models.Book.objects.filter(media__type='daisy').distinct().order_by('sort_key_author', 'sort_key')
+
+ return render(request, 'catalogue/audiobook_list.html', {
+ 'books': books,
+ 'best': best,
+ 'daisy': daisy,
+ })
def daisy_list(request):
def collection(request, slug):
coll = get_object_or_404(models.Collection, slug=slug)
- if coll.kind == 'book':
- view = book_list
- tmpl = "catalogue/collection.html"
- elif coll.kind == 'picture':
- view = picture_list_thumb
- tmpl = "picture/collection.html"
- else:
- raise ValueError('How do I show this kind of collection? %s' % coll.kind)
- return view(request, get_filter=coll.get_query,
- template_name=tmpl,
- context={'collection': coll})
+ return render(request, 'catalogue/collection.html', {'collection': coll})
def differentiate_tags(request, tags, ambiguous_slugs):
'url_args': '/'.join((beginning, tag.url_chunk, unparsed)).strip('/'),
'tags': [tag]
})
- return render_to_response('catalogue/differentiate_tags.html',
- {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]},
- context_instance=RequestContext(request))
+ return render_to_response(
+ 'catalogue/differentiate_tags.html', {'tags': tags, 'options': options, 'unparsed': ambiguous_slugs[1:]},
+ context_instance=RequestContext(request))
# TODO: Rewrite this hellish piece of code which tries to do everything
-def tagged_object_list(request, tags=''):
+def tagged_object_list(request, tags='', gallery=False):
+ raw_tags = tags
# preliminary tests and conditions
try:
tags = models.Tag.get_tag_list(tags)
# Ask the user to disambiguate
return differentiate_tags(request, e.tags, e.ambiguous_slugs)
except models.Tag.UrlDeprecationWarning, e:
- return HttpResponsePermanentRedirect(reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)]))
+ return HttpResponsePermanentRedirect(
+ reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)]))
try:
if len(tags) > settings.MAX_TAG_LIST:
objects = None
if theme_is_set:
+ # Only fragments (or pirctureareas) here.
shelf_tags = [tag for tag in tags if tag.category == 'set']
fragment_tags = [tag for tag in tags if tag.category != 'set']
- fragments = models.Fragment.tagged.with_all(fragment_tags)
- areas = PictureArea.tagged.with_all(fragment_tags)
+ if gallery:
+ fragments = PictureArea.tagged.with_all(fragment_tags)
+ else:
+ fragments = models.Fragment.tagged.with_all(fragment_tags)
if shelf_tags:
- books = models.Book.tagged.with_all(shelf_tags).order_by()
- fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books))
- areas = PictureArea.objects.none()
+ if gallery:
+ # TODO: Pictures on shelves not supported yet.
+ raise Http404
+ else:
+ books = models.Book.tagged.with_all(shelf_tags).order_by()
+ fragments = fragments.filter(Q(book__in=books) | Q(book__ancestor__in=books))
categories = split_tags(
- models.Tag.objects.usage_for_queryset(fragments, counts=True
- ).exclude(pk__in=tags_pks),
- models.Tag.objects.usage_for_queryset(areas, counts=True
- ).exclude(pk__in=tags_pks)
- )
+ models.Tag.objects.usage_for_queryset(fragments, counts=True).exclude(pk__in=tags_pks),
+ )
- # we want the Pictures to go first
- objects = MultiQuerySet(areas, fragments)
+ objects = fragments
else:
- all_books = models.Book.tagged.with_all(tags)
- if shelf_is_set:
- books = all_books.order_by('sort_key_author', 'title')
- pictures = Picture.objects.none()
- related_book_tags = models.Tag.objects.usage_for_queryset(
- books, counts=True).exclude(
- category='set').exclude(pk__in=tags_pks)
+ if gallery:
+ if shelf_is_set:
+ # TODO: Pictures on shelves not supported yet.
+ raise Http404
+ else:
+ if tags:
+ objects = Picture.tagged.with_all(tags)
+ else:
+ objects = Picture.objects.all()
+ areas = PictureArea.objects.filter(picture__in=objects)
+ categories = split_tags(
+ models.Tag.objects.usage_for_queryset(
+ objects, counts=True).exclude(pk__in=tags_pks),
+ models.Tag.objects.usage_for_queryset(
+ areas, counts=True).filter(
+ category__in=('theme', 'thing')).exclude(
+ pk__in=tags_pks),
+ )
else:
- books = models.Book.tagged_top_level(tags).order_by(
- 'sort_key_author', 'title')
- pictures = Picture.tagged.with_all(tags).order_by(
- 'sort_key_author', 'title')
- related_book_tags = get_top_level_related_tags(tags)
-
- fragments = models.Fragment.objects.filter(book__in=all_books)
- areas = PictureArea.objects.filter(picture__in=pictures)
+ if tags:
+ all_books = models.Book.tagged.with_all(tags)
+ else:
+ all_books = models.Book.objects.filter(parent=None)
+ if shelf_is_set:
+ objects = all_books
+ related_book_tags = models.Tag.objects.usage_for_queryset(
+ objects, counts=True).exclude(
+ category='set').exclude(pk__in=tags_pks)
+ else:
+ if tags:
+ objects = models.Book.tagged_top_level(tags)
+ else:
+ objects = all_books
+ # WTF: was outside if, overwriting value assigned if shelf_is_set
+ related_book_tags = get_top_level_related_tags(tags)
+
+ fragments = models.Fragment.objects.filter(book__in=all_books)
+
+ categories = split_tags(
+ related_book_tags,
+ models.Tag.objects.usage_for_queryset(
+ fragments, counts=True).filter(
+ category='theme').exclude(pk__in=tags_pks),
+ )
+ objects = objects.order_by('sort_key_author', 'sort_key')
- categories = split_tags(
- related_book_tags,
- models.Tag.objects.usage_for_queryset(
- pictures, counts=True).exclude(pk__in=tags_pks),
- models.Tag.objects.usage_for_queryset(
- fragments, counts=True).filter(
- category='theme').exclude(pk__in=tags_pks),
- models.Tag.objects.usage_for_queryset(
- areas, counts=True).filter(
- category__in=('theme', 'thing')).exclude(
- pk__in=tags_pks),
- )
+ objects = list(objects)
+ if len(objects) > 3:
+ best = random.sample(objects, 3)
+ else:
+ best = objects
- objects = SortedMultiQuerySet(pictures, books,
- order_by=('sort_key_author', 'title'))
+ if not gallery and not objects and len(tags) == 1:
+ tag = tags[0]
+ if (tag.category in ('theme', 'thing') and PictureArea.tagged.with_any([tag]).exists() or
+ Picture.tagged.with_any([tag]).exists()):
+ return redirect('tagged_object_list_gallery', raw_tags, permanent=False)
- return render_to_response('catalogue/tagged_object_list.html',
+ return render_to_response(
+ 'catalogue/tagged_object_list.html',
{
'object_list': objects,
'categories': categories,
'tags': tags,
'tag_ids': tags_pks,
'theme_is_set': theme_is_set,
+ 'best': best,
+ 'gallery': gallery,
},
context_instance=RequestContext(request))
fragments = models.Fragment.tagged.with_all([theme]).filter(
Q(book=book) | Q(book__ancestor=book))
- return render_to_response('catalogue/book_fragments.html', locals(),
- context_instance=RequestContext(request))
+ return render_to_response('catalogue/book_fragments.html', locals(), context_instance=RequestContext(request))
def book_detail(request, slug):
except models.Book.DoesNotExist:
return pdcounter_views.book_stub_detail(request, slug)
+ tags = book.tags.exclude(category__in=('set', 'theme'))
book_children = book.children.all().order_by('parent_number', 'sort_key')
- return render_to_response('catalogue/book_detail.html', locals(),
- context_instance=RequestContext(request))
+ return render_to_response('catalogue/book_detail.html', locals(), context_instance=RequestContext(request))
-def player(request, slug):
- book = get_object_or_404(models.Book, slug=slug)
- if not book.has_media('mp3'):
- raise Http404
-
+def get_audiobooks(book):
ogg_files = {}
for m in book.media.filter(type='ogg').order_by().iterator():
ogg_files[m.name] = m
audiobooks.append(media)
projects = sorted(projects)
+ return audiobooks, projects, have_oggs
+
+
+def player(request, slug):
+ book = get_object_or_404(models.Book, slug=slug)
+ if not book.has_media('mp3'):
+ raise Http404
+
+ audiobooks, projects, have_oggs = get_audiobooks(book)
extra_info = book.extra_info
- return render_to_response('catalogue/player.html', locals(),
- context_instance=RequestContext(request))
+ return render_to_response('catalogue/player.html', locals(), context_instance=RequestContext(request))
def book_text(request, slug):
if not book.has_html_file():
raise Http404
- return render_to_response('catalogue/book_text.html', locals(),
- context_instance=RequestContext(request))
+ return render_to_response('catalogue/book_text.html', locals(), context_instance=RequestContext(request))
# ==========
should be locale-aware """
names = {
- u'a':u'aąĄ', u'c':u'cćĆ', u'e':u'eęĘ', u'l': u'lłŁ', u'n':u'nńŃ', u'o':u'oóÓ', u's':u'sśŚ', u'z':u'zźżŹŻ',
- u'ą':u'ąĄ', u'ć':u'ćĆ', u'ę':u'ęĘ', u'ł': u'łŁ', u'ń':u'ńŃ', u'ó':u'óÓ', u'ś':u'śŚ', u'ź':u'źŹ', u'ż':u'żŻ'
+ u'a': u'aąĄ', u'c': u'cćĆ', u'e': u'eęĘ', u'l': u'lłŁ', u'n': u'nńŃ', u'o': u'oóÓ', u's': u'sśŚ',
+ u'z': u'zźżŹŻ',
+ u'ą': u'ąĄ', u'ć': u'ćĆ', u'ę': u'ęĘ', u'ł': u'łŁ', u'ń': u'ńŃ', u'ó': u'óÓ', u'ś': u'śŚ', u'ź': u'źŹ',
+ u'ż': u'żŻ'
}
+
def repl(m):
l = m.group()
- return u"(%s)" % '|'.join(names[l])
+ return u"(?:%s)" % '|'.join(names[l])
+
return re.sub(u'[%s]' % (u''.join(names.keys())), repl, query)
+
def unicode_re_escape(query):
""" Unicode-friendly version of re.escape """
return re.sub(r'(?u)(\W)', r'\\\1', query)
+
def _word_starts_with(name, prefix):
"""returns a Q object getting models having `name` contain a word
starting with `prefix`
SQLite in Django uses Python re module
"""
- kwargs = {}
- kwargs['%s__iregex' % name] = _word_starts_with_regexp(prefix)
+ kwargs = {'%s__iregex' % name: _word_starts_with_regexp(prefix)}
return Q(**kwargs)
_word_starts_with = _sqlite_word_starts_with
-class App():
+class App:
def __init__(self, name, view):
self.name = name
self._view = view
self.lower = name.lower()
self.category = 'application'
+
def view(self):
return reverse(*self._view)
tags = tags.exclude(category='set')
prefix_regexp = re.compile(_word_starts_with_regexp(prefix))
- return list(books) + list(tags) + [app for app in _apps if prefix_regexp.search(app.lower)] + list(book_stubs) + list(authors)
+ return list(books) + list(tags) + [app for app in _apps if prefix_regexp.search(app.lower)] + list(book_stubs) + \
+ list(authors)
def _get_result_link(match, tag_list):
if isinstance(match, models.Tag):
return reverse('catalogue.views.tagged_object_list',
- kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])}
- )
+ kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])})
elif isinstance(match, App):
return match.view()
else:
authors = set(match.name.lower() for match in result
if isinstance(match, models.Tag) and match.category == 'author')
result = tuple(res for res in result if not (
- (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles)
- or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors)
+ (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles) or
+ (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors)
))
exact_matches = tuple(res for res in result if res.name.lower() == query)
try:
tag_list = models.Tag.get_tag_list(tags)
- except:
+ except (models.Tag.DoesNotExist, models.Tag.MultipleObjectsReturned, models.Tag.UrlDeprecationWarning):
tag_list = []
try:
result = find_best_matches(prefix, request.user)
except ValueError:
- return render_to_response('catalogue/search_too_short.html', {'tags':tag_list, 'prefix':prefix},
+ return render_to_response(
+ 'catalogue/search_too_short.html', {'tags': tag_list, 'prefix': prefix},
context_instance=RequestContext(request))
if len(result) == 1:
return HttpResponseRedirect(_get_result_link(result[0], tag_list))
elif len(result) > 1:
- return render_to_response('catalogue/search_multiple_hits.html',
- {'tags':tag_list, 'prefix':prefix, 'results':((x, _get_result_link(x, tag_list), _get_result_type(x)) for x in result)},
+ return render_to_response(
+ 'catalogue/search_multiple_hits.html',
+ {
+ 'tags': tag_list, 'prefix': prefix,
+ 'results': ((x, _get_result_link(x, tag_list), _get_result_type(x)) for x in result)
+ },
context_instance=RequestContext(request))
else:
form = PublishingSuggestForm(initial={"books": prefix + ", "})
- return render_to_response('catalogue/search_no_hits.html',
- {'tags':tag_list, 'prefix':prefix, "pubsuggest_form": form},
+ return render_to_response(
+ 'catalogue/search_no_hits.html',
+ {'tags': tag_list, 'prefix': prefix, "pubsuggest_form": form},
context_instance=RequestContext(request))
tags_list = []
result = ""
for tag in _tags_starting_with(prefix, request.user):
- if not tag.name in tags_list:
+ if tag.name not in tags_list:
result += "\n" + tag.name
tags_list.append(tag.name)
return HttpResponse(result)
+
def json_tags_starting_with(request, callback=None):
# Callback for JSONP
prefix = request.GET.get('q', '')
return HttpResponse('')
tags_list = []
for tag in _tags_starting_with(prefix, request.user):
- if not tag.name in tags_list:
+ if tag.name not in tags_list:
tags_list.append(tag.name)
if request.GET.get('mozhint', ''):
result = [prefix, tags_list]
info = sys.exc_info()
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')
+ return HttpResponse(
+ _("An error occurred: %(exception)s\n\n%(tb)s") % {'exception': exception, 'tb': tb},
+ mimetype='text/plain')
return HttpResponse(_("Book imported successfully"))
else:
return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
# info views for API
-def book_info(request, id, lang='pl'):
- book = get_object_or_404(models.Book, id=id)
+def book_info(request, book_id, lang='pl'):
+ book = get_object_or_404(models.Book, id=book_id)
# set language by hand
translation.activate(lang)
- return render_to_response('catalogue/book_info.html', locals(),
- context_instance=RequestContext(request))
+ return render_to_response('catalogue/book_info.html', locals(), context_instance=RequestContext(request))
-def tag_info(request, id):
- tag = get_object_or_404(models.Tag, id=id)
+def tag_info(request, tag_id):
+ tag = get_object_or_404(models.Tag, id=tag_id)
return HttpResponse(tag.description)
def download_zip(request, format, slug=None):
- url = None
if format in models.Book.ebook_formats:
url = models.Book.zip_format(format)
elif format in ('mp3', 'ogg') and slug is not None:
@ssi_included
def book_mini(request, pk, with_link=True):
book = get_object_or_404(models.Book, pk=pk)
- author_str = ", ".join(tag.name
- for tag in book.tags.filter(category='author'))
+ author_str = ", ".join(tag.name for tag in book.tags.filter(category='author'))
return render(request, 'catalogue/book_mini_box.html', {
'book': book,
'author_str': author_str,
def book_short(request, pk):
book = get_object_or_404(models.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,
'show_lang': book.language_code() != settings.LANGUAGE_CODE,
'stage_note': stage_note,
'stage_note_url': stage_note_url,
+ 'audiobooks': audiobooks,
+ 'have_oggs': have_oggs,
})
-@ssi_included(get_ssi_vars=lambda pk: book_short.get_ssi_vars(pk) +
+@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], {
book = get_object_or_404(models.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,
'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'),
- 'themes': book.related_themes(),
+ 'audiobooks': audiobooks,
+ 'have_oggs': have_oggs,
})
@ssi_included
def fragment_short(request, pk):
fragment = get_object_or_404(models.Fragment, pk=pk)
- return render(request, 'catalogue/fragment_short.html',
- {'fragment': fragment})
+ return render(request, 'catalogue/fragment_short.html', {'fragment': fragment})
@ssi_included
def fragment_promo(request, pk):
fragment = get_object_or_404(models.Fragment, pk=pk)
- return render(request, 'catalogue/fragment_promo.html', {
- 'fragment': fragment
+ return render(request, 'catalogue/fragment_promo.html', {'fragment': fragment})
+
+
+@ssi_included
+def tag_box(request, pk):
+ tag = get_object_or_404(models.Tag, pk=pk)
+ assert tag.category != 'set'
+
+ return render(request, 'catalogue/tag_box.html', {
+ 'tag': tag,
+ })
+
+
+@ssi_included
+def collection_box(request, pk):
+ obj = get_object_or_404(models.Collection, pk=pk)
+
+ return render(request, 'catalogue/collection_box.html', {
+ 'obj': obj,
+ })
+
+
+def tag_catalogue(request, category):
+ if category == 'theme':
+ tags = models.Tag.objects.usage_for_model(
+ models.Fragment, counts=True).filter(category='theme')
+ else:
+ tags = list(get_top_level_related_tags((), categories=(category,)))
+
+ described_tags = [tag for tag in tags if tag.description]
+
+ if len(described_tags) > 4:
+ best = random.sample(described_tags, 4)
+ else:
+ best = described_tags
+
+ return render(request, 'catalogue/tag_catalogue.html', {
+ 'tags': tags,
+ 'best': best,
+ 'title': constants.CATEGORIES_NAME_PLURAL[category],
+ 'whole_category': constants.WHOLE_CATEGORY[category],
+ })
+
+
+def collections(request):
+ objects = models.Collection.objects.all()
+
+ if len(objects) > 3:
+ best = random.sample(objects, 3)
+ else:
+ best = objects
+
+ return render(request, 'catalogue/collections.html', {
+ 'objects': objects,
+ 'best': best,
})
fnp / wolnelektury.git / blobdiff