Minor fixes in picture publishing process.
[wolnelektury.git] / apps / catalogue / views.py
index 6de5a26..a25a08f 100644 (file)
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
-import tempfile
-import zipfile
-import sys
-import pprint
-import traceback
+from collections import OrderedDict
+import re
 
 from django.conf import settings
 from django.template import RequestContext
-from django.shortcuts import render_to_response, get_object_or_404
-from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.template.loader import render_to_string
+from django.shortcuts import render_to_response, get_object_or_404, render
+from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect, JsonResponse
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.contrib.auth.decorators import login_required, user_passes_test
-from django.utils.datastructures import SortedDict
-from django.views.decorators.http import require_POST
-from django.contrib import auth
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
-from django.utils import simplejson
-from django.utils.functional import Promise
-from django.utils.encoding import force_unicode
-from django.views.decorators import cache
-
-from catalogue import models
+from django.utils.http import urlquote_plus
+from django.utils import translation
+from django.utils.translation import ugettext as _, ugettext_lazy
+
+from ajaxable.utils import AjaxableFormView
+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 forms
-from catalogue.utils import split_tags
-from newtagging import views as newtagging_views
-
+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
 
 staff_required = user_passes_test(lambda user: user.is_staff)
 
 
-class LazyEncoder(simplejson.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, Promise):
-            return force_unicode(obj)
-        return obj
-
-
-def main_page(request):    
-    if request.user.is_authenticated():
-        shelves = models.Tag.objects.filter(category='set', user=request.user)
-        new_set_form = forms.NewSetForm()
-    extra_where = "NOT catalogue_tag.category = 'set'"
-    tags = models.Tag.objects.usage_for_model(models.Book, counts=True, extra={'where': [extra_where]})
-    fragment_tags = models.Tag.objects.usage_for_model(models.Fragment, counts=True,
-        extra={'where': ["catalogue_tag.category = 'theme'"] + [extra_where]})
-    categories = split_tags(tags)
-    
-    form = forms.SearchForm()
-    return render_to_response('catalogue/main_page.html', locals(),
-        context_instance=RequestContext(request))
+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),
+        )
+
+    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))
 
 
-def book_list(request):
-    books = models.Book.objects.all()
-    form = forms.SearchForm()
-    
-    books_by_first_letter = SortedDict()
-    for book in books:
-        books_by_first_letter.setdefault(book.title[0], []).append(book)
-    
-    return render_to_response('catalogue/book_list.html', locals(),
+@ssi_included
+def catalogue_json(request):
+    return catalogue(request, True)
+
+
+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_by_author, orphans, books_by_parent = models.Book.book_list(filter)
+    books_nav = OrderedDict()
+    for tag in books_by_author:
+        if books_by_author[tag]:
+            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))
 
 
+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',
+                     )
+
+
+def daisy_list(request):
+    return book_list(request, Q(media__type='daisy'),
+                     template_name='catalogue/daisy_list.html',
+                     )
+
+
+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})
+
+
+def differentiate_tags(request, tags, ambiguous_slugs):
+    beginning = '/'.join(tag.url_chunk for tag in tags)
+    unparsed = '/'.join(ambiguous_slugs[1:])
+    options = []
+    for tag in models.Tag.objects.filter(slug=ambiguous_slugs[0]):
+        options.append({
+            '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))
+
+
+# TODO: Rewrite this hellish piece of code which tries to do everything
 def tagged_object_list(request, tags=''):
-    # Prevent DoS attacks on our database
-    if len(tags.split('/')) > 6:
-        raise Http404
-        
+    # preliminary tests and conditions
     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:
-        raise Http404
-    
-    if len([tag for tag in tags if tag.category == 'book']):
-        raise Http404
-    
-    model = models.Book
-    shelf = [tag for tag in tags if tag.category == 'set']
-    shelf_is_set = (len(tags) == 1 and tags[0].category == 'set')
-    theme_is_set = len([tag for tag in tags if tag.category == 'theme']) > 0
+        # Perhaps the user is asking about an author in Public Domain
+        # counter (they are not represented in tags)
+        chunks = tags.split('/')
+        if len(chunks) == 2 and chunks[0] == 'autor':
+            return pdcounter_views.author_detail(request, chunks[1])
+        else:
+            raise Http404
+    except models.Tag.MultipleObjectsReturned, e:
+        # 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)]))
+
+    try:
+        if len(tags) > settings.MAX_TAG_LIST:
+            raise Http404
+    except AttributeError:
+        pass
+
+    # beginning of digestion
+    theme_is_set = [tag for tag in tags if tag.category == 'theme']
+    shelf_is_set = [tag for tag in tags if tag.category == 'set']
+    only_shelf = shelf_is_set and len(tags) == 1
+    only_my_shelf = only_shelf and request.user.is_authenticated() and request.user == tags[0].user
+    tags_pks = [tag.pk for tag in tags]
+
+    objects = None
+
     if theme_is_set:
-        model = models.Fragment
-    only_author = len(tags) == 1 and tags[0].category == 'author'
-    pd_counter = only_author and tags[0].goes_to_pd()
-
-    user_is_owner = (len(shelf) and request.user.is_authenticated() and request.user == shelf[0].user)
-    
-    extra_where = "catalogue_tag.category NOT IN ('set', 'book')"
-    related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
-    categories = split_tags(related_tags)
-
-    if not (theme_is_set or shelf_is_set):
-        model=models.Book.objects.filter(parent=None)
-    
-    return newtagging_views.tagged_object_list(
-        request,
-        tag_model=models.Tag,
-        queryset_or_model=model,
-        tags=tags,
-        template_name='catalogue/tagged_object_list.html',
-        extra_context = {
+        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 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()
+
+        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)
+            )
+
+        # we want the Pictures to go first
+        objects = MultiQuerySet(areas, 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)
+        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)
+
+        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 = SortedMultiQuerySet(pictures, books,
+            order_by=('sort_key_author', 'title'))
+
+    return render_to_response('catalogue/tagged_object_list.html',
+        {
+            'object_list': objects,
             'categories': categories,
-            'shelf_is_set': shelf_is_set,
-            'only_author': only_author,
-            'pd_counter': pd_counter,
-            'user_is_owner': user_is_owner,
+            'only_shelf': only_shelf,
+            'only_my_shelf': only_my_shelf,
             'formats_form': forms.DownloadFormatsForm(),
+            'tags': tags,
+            'tag_ids': tags_pks,
+            'theme_is_set': theme_is_set,
         },
-    )
+        context_instance=RequestContext(request))
+
 
+def book_fragments(request, slug, theme_slug):
+    book = get_object_or_404(models.Book, slug=slug)
+    theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme')
+    fragments = models.Fragment.tagged.with_all([theme]).filter(
+        Q(book=book) | Q(book__ancestor=book))
 
-def book_fragments(request, book_slug, theme_slug):
-    book = get_object_or_404(models.Book, slug=book_slug)
-    book_tag = get_object_or_404(models.Tag, slug='l-' + book_slug)
-    theme = get_object_or_404(models.Tag, slug=theme_slug)
-    fragments = models.Fragment.tagged.with_all([book_tag, theme])
-    
-    form = forms.SearchForm()
     return render_to_response('catalogue/book_fragments.html', locals(),
         context_instance=RequestContext(request))
 
@@ -130,39 +270,57 @@ def book_detail(request, slug):
     try:
         book = models.Book.objects.get(slug=slug)
     except models.Book.DoesNotExist:
-        return book_stub_detail(request, slug)
-
-    book_tag = get_object_or_404(models.Tag, slug = 'l-' + slug)
-    tags = list(book.tags.filter(~Q(category='set')))
-    categories = split_tags(tags)
-    book_children = book.children.all().order_by('parent_number')
-    extra_where = "catalogue_tag.category = 'theme'"
-    book_themes = models.Tag.objects.related_for_model(book_tag, models.Fragment, counts=True, extra={'where': [extra_where]})
-    extra_info = book.get_extra_info_value()
-    
-    form = forms.SearchForm()
+        return pdcounter_views.book_stub_detail(request, slug)
+
+    book_children = book.children.all().order_by('parent_number', 'sort_key')
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))
 
 
-def book_stub_detail(request, slug):
-    book = get_object_or_404(models.BookStub, slug=slug)
-    pd_counter = book.pd
-    form = forms.SearchForm()
-    
-    return render_to_response('catalogue/book_stub_detail.html', locals(),
+def player(request, slug):
+    book = get_object_or_404(models.Book, slug=slug)
+    if not book.has_media('mp3'):
+        raise Http404
+
+    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)
+
+    extra_info = book.extra_info
+
+    return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
-    
+
 
 def book_text(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
-    book_themes = {}
-    for fragment in book.fragments.all():
-        for theme in fragment.tags.filter(category='theme'):
-            book_themes.setdefault(theme, []).append(fragment)
-    
-    book_themes = book_themes.items()
-    book_themes.sort(key=lambda s: s[0].sort_key)
+
+    if not book.has_html_file():
+        raise Http404
     return render_to_response('catalogue/book_text.html', locals(),
         context_instance=RequestContext(request))
 
@@ -170,288 +328,213 @@ def book_text(request, slug):
 # ==========
 # = Search =
 # ==========
+
+def _no_diacritics_regexp(query):
+    """ returns a regexp for searching for a query without diacritics
+
+    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'żŻ'
+        }
+    def repl(m):
+        l = m.group()
+        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 gettings models having `name` contain a word
+    """returns a Q object getting models having `name` contain a word
     starting with `prefix`
+
+    We define word characters as alphanumeric and underscore, like in JS.
+
+    Works for MySQL, PostgreSQL, Oracle.
+    For SQLite, _sqlite* version is substituted for this.
     """
     kwargs = {}
-    if settings.DATABASE_ENGINE in ('mysql', 'postgresql_psycopg2', 'postgresql'):
-        # we must escape `prefix` so that it only matches literally
-        for special in r'\^$.*+?|(){}[]':
-            prefix = prefix.replace(special, '\\' + special)
-        
-        # we could use a [[:<:]] (word start), 
-        # but we want both `xy` and `(xy` to catch `(xyz)`
-        kwargs['%s__iregex' % name] = u"(^|[^[:alpha:]])%s" % prefix
-    else:
-        # don't know how to do a generic regex
-        # checking for simple icontain instead
-        kwargs['%s__icontains' % name] = prefix
+
+    prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
+    # can't use [[:<:]] (word start),
+    # but we want both `xy` and `(xy` to catch `(xyz)`
+    kwargs['%s__iregex' % name] = u"(^|[^[:alnum:]_])%s" % prefix
+
     return Q(**kwargs)
 
 
-def _tags_starting_with(prefix, user):
-    book_stubs = models.BookStub.objects.filter(_word_starts_with('title', prefix))
-    books = models.Book.objects.filter(_word_starts_with('title', prefix))
-    book_stubs = filter(lambda x: x not in books, book_stubs)
-    tags = models.Tag.objects.filter(_word_starts_with('name', prefix))
-    if user.is_authenticated():
-        tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))
-    else:
-        tags = tags.filter(~Q(category='book') & ~Q(category='set'))
+def _word_starts_with_regexp(prefix):
+    prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
+    return ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix
 
-    return list(books) + list(tags) + list(book_stubs)
-        
 
-def search(request):
-    tags = request.GET.get('tags', '')
-    prefix = request.GET.get('q', '')
-    # Prefix must have at least 2 characters
-    if len(prefix) < 2:
-        return HttpResponse('')
-    
-    try:
-        tag_list = models.Tag.get_tag_list(tags)
-    except:
-        tag_list = []
-    
-    result = _tags_starting_with(prefix, request.user)
-    if len(result) > 0:
-        tag = result[0]
-        if isinstance(tag, models.Book) or isinstance(tag, models.BookStub):
-            return HttpResponseRedirect(tag.get_absolute_url())
-        else:
-            tag_list.append(tag)
-            
-            return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', 
-                kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
-            ))
+def _sqlite_word_starts_with(name, prefix):
+    """ version of _word_starts_with for SQLite
+
+    SQLite in Django uses Python re module
+    """
+    kwargs = {}
+    kwargs['%s__iregex' % name] = _word_starts_with_regexp(prefix)
+    return Q(**kwargs)
+
+
+if hasattr(settings, 'DATABASES'):
+    if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
+        _word_starts_with = _sqlite_word_starts_with
+elif settings.DATABASE_ENGINE == 'sqlite3':
+    _word_starts_with = _sqlite_word_starts_with
+
+
+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)
+
+_apps = (
+    App(u'Leśmianator', (u'lesmianator', )),
+    )
+
+
+def _tags_starting_with(prefix, user=None):
+    prefix = prefix.lower()
+    # PD counter
+    book_stubs = pdcounter_models.BookStub.objects.filter(_word_starts_with('title', prefix))
+    authors = pdcounter_models.Author.objects.filter(_word_starts_with('name', prefix))
+
+    books = models.Book.objects.filter(_word_starts_with('title', prefix))
+    tags = models.Tag.objects.filter(_word_starts_with('name', prefix))
+    if user and user.is_authenticated():
+        tags = tags.filter(~Q(category='set') | Q(user=user))
     else:
-        return render_to_response('catalogue/search_no_hits.html', {'query':prefix, 'tags':tag_list},
-            context_instance=RequestContext(request))
+        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)
 
-def tags_starting_with(request):
-    prefix = request.GET.get('q', '')
-    # Prefix must have at least 2 characters
-    if len(prefix) < 2:
-        return HttpResponse('')
-    
-    return HttpResponse('\n'.join(tag.name for tag in _tags_starting_with(prefix, request.user)))
 
+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])}
+        )
+    elif isinstance(match, App):
+        return match.view()
+    else:
+        return match.get_absolute_url()
 
-# ====================
-# = Shelf management =
-# ====================
-@login_required
-@cache.never_cache
-def user_shelves(request):
-    shelves = models.Tag.objects.filter(category='set', user=request.user)
-    new_set_form = forms.NewSetForm()
-    return render_to_response('catalogue/user_shelves.html', locals(),
-            context_instance=RequestContext(request))
 
-@cache.never_cache
-def book_sets(request, slug):
-    book = get_object_or_404(models.Book, slug=slug)
-    user_sets = models.Tag.objects.filter(category='set', user=request.user)
-    book_sets = book.tags.filter(category='set', user=request.user)
-    
-    if not request.user.is_authenticated():
-        return HttpResponse('<p>Aby zarządzać swoimi półkami, musisz się zalogować.</p>')
-    
-    if request.method == 'POST':
-        form = forms.ObjectSetsForm(book, request.user, request.POST)
-        if form.is_valid():
-            old_shelves = list(book.tags.filter(category='set'))
-            new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']]
-            
-            for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]:
-                shelf.book_count -= 1
-                shelf.save()
-                
-            for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:
-                shelf.book_count += 1
-                shelf.save()
-            
-            book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
-            if request.is_ajax():
-                return HttpResponse('<p>Półki zostały zapisane.</p>')
-            else:
-                return HttpResponseRedirect('/')
+def _get_result_type(match):
+    if isinstance(match, models.Book) or isinstance(match, pdcounter_models.BookStub):
+        match_type = 'book'
     else:
-        form = forms.ObjectSetsForm(book, request.user)
-        new_set_form = forms.NewSetForm()
-    
-    return render_to_response('catalogue/book_sets.html', locals(),
-        context_instance=RequestContext(request))
+        match_type = match.category
+    return match_type
 
 
-@login_required
-@require_POST
-@cache.never_cache
-def remove_from_shelf(request, shelf, book):
-    book = get_object_or_404(models.Book, slug=book)
-    shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user)
-    
-    models.Tag.objects.remove_tag(book, shelf)
-    
-    shelf.book_count -= 1
-    shelf.save()
-    
-    return HttpResponse('Usunieto')
-
-
-def collect_books(books):
-    """
-    Returns all real books in collection.
-    """
-    result = []
-    for book in books:
-        if len(book.children.all()) == 0:
-            result.append(book)
-        else:
-            result += collect_books(book.children.all())
-    return result
+def books_starting_with(prefix):
+    prefix = prefix.lower()
+    return models.Book.objects.filter(_word_starts_with('title', prefix))
 
 
-@cache.never_cache
-def download_shelf(request, slug):
-    """"
-    Create a ZIP archive on disk and transmit it in chunks of 8KB,
-    without loading the whole file into memory. A similar approach can
-    be used for large dynamic PDF files.                                        
-    """
-    shelf = get_object_or_404(models.Tag, slug=slug, category='set')
-    
-    formats = []
-    form = forms.DownloadFormatsForm(request.GET)
-    if form.is_valid():
-        formats = form.cleaned_data['formats']
-    if len(formats) == 0:
-        formats = ['pdf', 'odt', 'txt', 'mp3', 'ogg']
-    
-    # Create a ZIP archive
-    temp = temp = tempfile.TemporaryFile()
-    archive = zipfile.ZipFile(temp, 'w')
-    
-    for book in collect_books(models.Book.tagged.with_all(shelf)):
-        if 'pdf' in formats and book.pdf_file:
-            filename = book.pdf_file.path
-            archive.write(filename, str('%s.pdf' % book.slug))
-        if 'odt' in formats and book.odt_file:
-            filename = book.odt_file.path
-            archive.write(filename, str('%s.odt' % book.slug))
-        if 'txt' in formats and book.txt_file:
-            filename = book.txt_file.path
-            archive.write(filename, str('%s.txt' % book.slug))
-        if 'mp3' in formats and book.mp3_file:
-            filename = book.mp3_file.path
-            archive.write(filename, str('%s.mp3' % book.slug))
-        if 'ogg' in formats and book.ogg_file:
-            filename = book.ogg_file.path
-            archive.write(filename, str('%s.ogg' % book.slug))
-    archive.close()
-    
-    response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
-    response['Content-Disposition'] = 'attachment; filename=%s.zip' % shelf.sort_key
-    response['Content-Length'] = temp.tell()
-    
-    temp.seek(0)
-    response.write(temp.read())
-    return response
+def find_best_matches(query, user=None):
+    """ Finds a models.Book, Tag, models.BookStub or Author best matching a query.
 
+    Returns a with:
+      - zero elements when nothing is found,
+      - one element when a best result is found,
+      - more then one element on multiple exact matches
 
-@cache.never_cache
-def shelf_book_formats(request, shelf):
-    """"
-    Returns a list of formats of books in shelf.
+    Raises a ValueError on too short a query.
     """
-    shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
 
-    formats = {'pdf': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False}
-    
-    for book in collect_books(models.Book.tagged.with_all(shelf)):
-        if book.pdf_file:
-            formats['pdf'] = True
-        if book.odt_file:
-            formats['odt'] = True
-        if book.txt_file:
-            formats['txt'] = True
-        if book.mp3_file:
-            formats['mp3'] = True
-        if book.ogg_file:
-            formats['ogg'] = True
-
-    return HttpResponse(LazyEncoder().encode(formats))
+    query = query.lower()
+    if len(query) < 2:
+        raise ValueError("query must have at least two characters")
+
+    result = tuple(_tags_starting_with(query, user))
+    # remove pdcounter stuff
+    book_titles = set(match.pretty_title().lower() for match in result
+                      if isinstance(match, models.Book))
+    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)
+             ))
+
+    exact_matches = tuple(res for res in result if res.name.lower() == query)
+    if exact_matches:
+        return exact_matches
+    else:
+        return tuple(result)[:1]
 
 
-@login_required
-@require_POST
-@cache.never_cache
-def new_set(request):
-    new_set_form = forms.NewSetForm(request.POST)
-    if new_set_form.is_valid():
-        new_set = new_set_form.save(request.user)
-
-        if request.is_ajax():
-            return HttpResponse(u'<p>Półka <strong>%s</strong> została utworzona</p>' % new_set)
-        else:
-            return HttpResponseRedirect('/')
+def search(request):
+    tags = request.GET.get('tags', '')
+    prefix = request.GET.get('q', '')
 
-    return HttpResponseRedirect('/')
+    try:
+        tag_list = models.Tag.get_tag_list(tags)
+    except:
+        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},
+            context_instance=RequestContext(request))
 
-@login_required
-@require_POST
-@cache.never_cache
-def delete_shelf(request, slug):
-    user_set = get_object_or_404(models.Tag, slug=slug, category='set', user=request.user)
-    user_set.delete()
-
-    if request.is_ajax():
-        return HttpResponse(u'<p>Półka <strong>%s</strong> została usunięta</p>' % user_set.name)
-    else:
-        return HttpResponseRedirect('/')
-
-
-# ==================
-# = Authentication =
-# ==================
-@require_POST
-@cache.never_cache
-def login(request):
-    form = AuthenticationForm(data=request.POST, prefix='login')
-    if form.is_valid():
-        auth.login(request, form.get_user())
-        response_data = {'success': True, 'errors': {}}
-    else:
-        response_data = {'success': False, 'errors': form.errors}
-    return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
-
-
-@require_POST
-@cache.never_cache
-def register(request):
-    registration_form = UserCreationForm(request.POST, prefix='registration')
-    if registration_form.is_valid():
-        user = registration_form.save()
-        user = auth.authenticate(
-            username=registration_form.cleaned_data['username'], 
-            password=registration_form.cleaned_data['password1']
-        )
-        auth.login(request, user)
-        response_data = {'success': True, 'errors': {}}
+    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)},
+            context_instance=RequestContext(request))
     else:
-        response_data = {'success': False, 'errors': registration_form.errors}
-    return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
-
+        form = PublishingSuggestForm(initial={"books": prefix + ", "})
+        return render_to_response('catalogue/search_no_hits.html',
+            {'tags':tag_list, 'prefix':prefix, "pubsuggest_form": form},
+            context_instance=RequestContext(request))
 
-@cache.never_cache
-def logout_then_redirect(request):
-    auth.logout(request)
-    return HttpResponseRedirect(request.GET.get('next', '/'))
 
+def tags_starting_with(request):
+    prefix = request.GET.get('q', '')
+    # Prefix must have at least 2 characters
+    if len(prefix) < 2:
+        return HttpResponse('')
+    tags_list = []
+    result = ""
+    for tag in _tags_starting_with(prefix, request.user):
+        if not tag.name 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', '')
+    callback = request.GET.get('callback', '')
+    # Prefix must have at least 2 characters
+    if len(prefix) < 2:
+        return HttpResponse('')
+    tags_list = []
+    for tag in _tags_starting_with(prefix, request.user):
+        if not tag.name in tags_list:
+            tags_list.append(tag.name)
+    if request.GET.get('mozhint', ''):
+        result = [prefix, tags_list]
+    else:
+        result = {"matches": tags_list}
+    response = JsonResponse(result, safe=False)
+    if callback:
+        response.content = callback + "(" + response.content + ");"
+    return response
 
 
 # =========
@@ -466,19 +549,143 @@ def import_book(request):
         try:
             book_import_form.save()
         except:
+            import sys
+            import pprint
+            import traceback
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))
-            return HttpResponse("An error occurred: %s\n\n%s" % (exception, tb), mimetype='text/plain')
-        return HttpResponse("Book imported successfully")
+            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)
+        return HttpResponse(_("Error importing file: %r") % book_import_form.errors)
 
 
+# info views for API
 
-def clock(request):
-    """ Provides server time for jquery.countdown,
-    in a format suitable for Date.parse()
-    """
-    from datetime import datetime
-    return HttpResponse(datetime.now().strftime('%Y/%m/%d %H:%M:%S'))
+def book_info(request, id, lang='pl'):
+    book = get_object_or_404(models.Book, id=id)
+    # set language by hand
+    translation.activate(lang)
+    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)
+    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:
+        book = get_object_or_404(models.Book, slug=slug)
+        url = book.zip_audiobooks(format)
+    else:
+        raise Http404('No format specified for zip package')
+    return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
+
+
+class CustomPDFFormView(AjaxableFormView):
+    form_class = forms.CustomPDFForm
+    title = ugettext_lazy('Download custom PDF')
+    submit = ugettext_lazy('Download')
+    honeypot = True
+
+    def __call__(self, *args, **kwargs):
+        if settings.NO_CUSTOM_PDF:
+            raise Http404('Custom PDF is disabled')
+        return super(CustomPDFFormView, self).__call__(*args, **kwargs)
+
+    def form_args(self, request, obj):
+        """Override to parse view args and give additional args to the form."""
+        return (obj,), {}
+
+    def get_object(self, request, slug, *args, **kwargs):
+        return get_object_or_404(models.Book, slug=slug)
+
+    def context_description(self, request, obj):
+        return obj.pretty_title()
+
+
+####
+# Includes
+####
+
+
+@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'))
+    return render(request, 'catalogue/book_mini_box.html', {
+        'book': book,
+        'author_str': author_str,
+        'with_link': with_link,
+        'show_lang': book.language_code() != settings.LANGUAGE_CODE,
+    })
+
+
+@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(models.Book, pk=pk)
+    stage_note, stage_note_url = book.stage_note()
+
+    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,
+    })
+
+
+@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': V('social_tags.choose_cite', [ipk])}),
+    ))(ssi_expect(pk, int)))
+def book_wide(request, pk):
+    book = get_object_or_404(models.Book, pk=pk)
+    stage_note, stage_note_url = book.stage_note()
+    extra_info = book.extra_info
+
+    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'),
+        'themes': book.related_themes(),
+    })
+
+
+@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})
+
+
+@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
+    })