slucha - 2 pliki jeszcze

[wolnelektury.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index e7df9bc..f1eeab7 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -2,88 +2,79 @@
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # 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

 import re
 import itertools
 import re
 import itertools

-from operator import itemgetter
+from datetime import datetime

 
 from django.conf import settings
 from django.template import RequestContext
 from django.shortcuts import render_to_response, get_object_or_404
 
 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.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect

 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse

-from django.db.models import Q
+from django.db.models import Count, Sum, 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.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.utils.http import urlquote_plus
 from django.views.decorators import cache
 from django.utils.http import urlquote_plus
 from django.views.decorators import cache

+from django.utils import translation

 from django.utils.translation import ugettext as _
 from django.views.generic.list_detail import object_list
 
 from django.utils.translation import ugettext as _
 from django.views.generic.list_detail import object_list
 

+from ajaxable.utils import LazyEncoder, JSONResponse

 from catalogue import models
 from catalogue import forms
 from catalogue import models
 from catalogue import forms

-from catalogue.utils import split_tags
-from newtagging import views as newtagging_views
+from catalogue.utils import split_tags, AttachmentHttpResponse, async_build_pdf
+from catalogue.tasks import touch_tag
+from pdcounter import models as pdcounter_models
+from pdcounter import views as pdcounter_views
+from suggest.forms import PublishingSuggestForm
+from picture.models import Picture

 
 

+from itertools import chain
+from os import path

 
 staff_required = user_passes_test(lambda user: user.is_staff)
 
 
 
 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
-
-# shortcut for JSON reponses
-class JSONResponse(HttpResponse):
-    def __init__(self, data={}, callback=None, **kwargs):
-        # get rid of mimetype
-        kwargs.pop('mimetype', None)
-        data = simplejson.dumps(data)
-        if callback:
-            data = callback + "(" + data + ");" 
-        super(JSONResponse, self).__init__(data, mimetype="application/json", **kwargs)
-
-
-def main_page(request):
-    if request.user.is_authenticated():
-        shelves = models.Tag.objects.filter(category='set', user=request.user)
-        new_set_form = forms.NewSetForm()
-
-    tags = models.Tag.objects.exclude(category__in=('set', 'book'))
+def catalogue(request):
+    tags = models.Tag.objects.exclude(
+        category__in=('set', 'book')).exclude(book_count=0)
+    tags = list(tags)

     for tag in tags:
     for tag in tags:

-        tag.count = tag.get_count()
+        tag.count = tag.book_count

     categories = split_tags(tags)
     fragment_tags = categories.get('theme', [])
 
     categories = split_tags(tags)
     fragment_tags = categories.get('theme', [])
 

-    form = forms.SearchForm()
-    return render_to_response('catalogue/main_page.html', locals(),
+    return render_to_response('catalogue/catalogue.html', locals(),

         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

-def book_list(request):
-    books = models.Book.objects.all()
-    form = forms.SearchForm()
+def book_list(request, filter=None, template_name='catalogue/book_list.html'):
+    """ generates a listing of all books, optionally filtered with a test function """

 
 

-    books_by_first_letter = SortedDict()
-    for book in books:
-        books_by_first_letter.setdefault(book.title[0], []).append(book)
+    books_by_author, orphans, books_by_parent = models.Book.book_list(filter)
+    books_nav = SortedDict()
+    for tag in books_by_author:
+        if books_by_author[tag]:
+            books_nav.setdefault(tag.sort_key[0], []).append(tag)

 
 

-    return render_to_response('catalogue/book_list.html', locals(),
+    return render_to_response(template_name, locals(),

         context_instance=RequestContext(request))
 
 
         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')
+
+
+def daisy_list(request):
+    return book_list(request, Q(media__type='daisy'),
+                     template_name='catalogue/daisy_list.html')
+
+

 def differentiate_tags(request, tags, ambiguous_slugs):
     beginning = '/'.join(tag.url_chunk for tag in tags)
     unparsed = '/'.join(ambiguous_slugs[1:])
 def differentiate_tags(request, tags, ambiguous_slugs):
     beginning = '/'.join(tag.url_chunk for tag in tags)
     unparsed = '/'.join(ambiguous_slugs[1:])


@@ -99,12 +90,19 @@ def differentiate_tags(request, tags, ambiguous_slugs):
 
 
 def tagged_object_list(request, tags=''):
 
 
 def tagged_object_list(request, tags=''):

+    #    import pdb; pdb.set_trace()

     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:
     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:

-        raise Http404
+        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:
         return differentiate_tags(request, e.tags, e.ambiguous_slugs)
     except models.Tag.MultipleObjectsReturned, e:
         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:
 
     try:
         if len(tags) > settings.MAX_TAG_LIST:


@@ -120,7 +118,7 @@ def tagged_object_list(request, tags=''):
     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
 
     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
 

-    objects = only_author = pd_counter = None
+    objects = only_author = None

     categories = {}
 
     if theme_is_set:
     categories = {}
 
     if theme_is_set:


@@ -146,14 +144,10 @@ def tagged_object_list(request, tags=''):
 
             objects = fragments
     else:
 
             objects = fragments
     else:

-        # get relevant books and their tags
-        objects = models.Book.tagged.with_all(tags).order_by()
-        if not shelf_is_set:
-            # eliminate descendants
-            l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects])
-            descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)]
-            if descendants_keys:
-                objects = objects.exclude(pk__in=descendants_keys)
+        if shelf_is_set:
+            objects = models.Book.tagged.with_all(tags)
+        else:
+            objects = models.Book.tagged_top_level(tags)

 
         # get related tags from `tag_counter` and `theme_counter`
         related_counts = {}
 
         # get related tags from `tag_counter` and `theme_counter`
         related_counts = {}


@@ -173,9 +167,11 @@ def tagged_object_list(request, tags=''):
 
     if not objects:
         only_author = len(tags) == 1 and tags[0].category == 'author'
 
     if not objects:
         only_author = len(tags) == 1 and tags[0].category == 'author'

-        pd_counter = only_author and tags[0].goes_to_pd()

         objects = models.Book.objects.none()
 
         objects = models.Book.objects.none()
 

+        # Add pictures
+    objects = Picture.tagged.with_all(tags)|objects
+

     return object_list(
         request,
         objects,
     return object_list(
         request,
         objects,


@@ -184,36 +180,47 @@ def tagged_object_list(request, tags=''):
             'categories': categories,
             'only_shelf': only_shelf,
             'only_author': only_author,
             'categories': categories,
             'only_shelf': only_shelf,
             'only_author': only_author,

-            'pd_counter': pd_counter,

             'only_my_shelf': only_my_shelf,
             'formats_form': forms.DownloadFormatsForm(),
             'only_my_shelf': only_my_shelf,
             'formats_form': forms.DownloadFormatsForm(),

-

             'tags': tags,
         }
     )
 
 
             'tags': tags,
         }
     )
 
 

-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, category='book')
+def book_fragments(request, book, theme_slug):
+    kwargs = models.Book.split_urlid(book)
+    if kwargs is None:
+        raise Http404
+    book = get_object_or_404(models.Book, **kwargs)
+
+    book_tag = book.book_tag()

     theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme')
     fragments = models.Fragment.tagged.with_all([book_tag, theme])
 
     theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme')
     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))
 
 
     return render_to_response('catalogue/book_fragments.html', locals(),
         context_instance=RequestContext(request))
 
 

-def book_detail(request, slug):
+def book_detail(request, book):
+    kwargs = models.Book.split_urlid(book)
+    if kwargs is None:
+        raise Http404

     try:
     try:

-        book = models.Book.objects.get(slug=slug)
+        book = models.Book.objects.get(**kwargs)

     except models.Book.DoesNotExist:
     except models.Book.DoesNotExist:

-        return book_stub_detail(request, slug)
-
+        return pdcounter_views.book_stub_detail(request, kwargs['slug'])
+    

     book_tag = book.book_tag()
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
     book_tag = book.book_tag()
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)

-    book_children = book.children.all().order_by('parent_number')
+    book_children = book.children.all().order_by('parent_number', 'sort_key')
+    
+    _book = book
+    parents = []
+    while _book.parent:
+        parents.append(_book.parent)
+        _book = _book.parent
+    parents = reversed(parents)

 
     theme_counter = book.theme_counter
     book_themes = models.Tag.objects.filter(pk__in=theme_counter.keys())
 
     theme_counter = book.theme_counter
     book_themes = models.Tag.objects.filter(pk__in=theme_counter.keys())


@@ -221,23 +228,33 @@ def book_detail(request, slug):
         tag.count = theme_counter[tag.pk]
 
     extra_info = book.get_extra_info_value()
         tag.count = theme_counter[tag.pk]
 
     extra_info = book.get_extra_info_value()

+    hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')

 
 

-    form = forms.SearchForm()
-    return render_to_response('catalogue/book_detail.html', locals(),
-        context_instance=RequestContext(request))
-
+    projects = set()
+    for m in book.media.filter(type='mp3'):
+        # ogg files are always from the same project
+        meta = m.get_extra_info_value()
+        project = meta.get('project')
+        if not project:
+            # temporary fallback
+            project = u'CzytamySłuchając'

 
 

-def book_stub_detail(request, slug):
-    book = get_object_or_404(models.BookStub, slug=slug)
-    pd_counter = book.pd
-    form = forms.SearchForm()
+        projects.add((project, meta.get('funded_by', '')))
+    projects = sorted(projects)

 
 

-    return render_to_response('catalogue/book_stub_detail.html', locals(),
+    custom_pdf_form = forms.CustomPDFForm()
+    return render_to_response('catalogue/book_detail.html', locals(),

         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

-def book_text(request, slug):
-    book = get_object_or_404(models.Book, slug=slug)
+def book_text(request, book):
+    kwargs = models.Book.split_fileid(book)
+    if kwargs is None:
+        raise Http404
+    book = get_object_or_404(models.Book, **kwargs)
+
+    if not book.has_html_file():
+        raise Http404

     book_themes = {}
     for fragment in book.fragments.all():
         for theme in fragment.tags.filter(category='theme'):
     book_themes = {}
     for fragment in book.fragments.all():
         for theme in fragment.tags.filter(category='theme'):


@@ -289,53 +306,85 @@ def _word_starts_with(name, prefix):
     return Q(**kwargs)
 
 
     return Q(**kwargs)
 
 

+def _word_starts_with_regexp(prefix):
+    prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
+    return ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix
+
+

 def _sqlite_word_starts_with(name, prefix):
     """ version of _word_starts_with for SQLite
 
     SQLite in Django uses Python re module
     """
     kwargs = {}
 def _sqlite_word_starts_with(name, prefix):
     """ version of _word_starts_with for SQLite
 
     SQLite in Django uses Python re module
     """
     kwargs = {}

-    prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
-    kwargs['%s__iregex' % name] = ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix
+    kwargs['%s__iregex' % name] = _word_starts_with_regexp(prefix)

     return Q(**kwargs)
 
 
     return Q(**kwargs)
 
 

-if settings.DATABASE_ENGINE == 'sqlite3':
+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
 
 
     _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()
 def _tags_starting_with(prefix, user=None):
     prefix = prefix.lower()

-    book_stubs = models.BookStub.objects.filter(_word_starts_with('title', prefix))
+    # 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))
     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 and 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'))
     tags = models.Tag.objects.filter(_word_starts_with('name', prefix))
     if user and 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'))

-    return list(books) + list(tags) + list(book_stubs)
+
+    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 _get_result_link(match, tag_list):
 
 
 def _get_result_link(match, tag_list):

-    if isinstance(match, models.Book) or isinstance(match, models.BookStub):
-        return match.get_absolute_url()
-    else:
+    if isinstance(match, models.Tag):

         return reverse('catalogue.views.tagged_object_list',
             kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])}
         )
         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()
+

 
 def _get_result_type(match):
 
 def _get_result_type(match):

-    if isinstance(match, models.Book) or isinstance(match, models.BookStub):
+    if isinstance(match, models.Book) or isinstance(match, pdcounter_models.BookStub):

         type = 'book'
     else:
         type = match.category
     return type
 
 
         type = 'book'
     else:
         type = match.category
     return type
 
 

+def books_starting_with(prefix):
+    prefix = prefix.lower()
+    return models.Book.objects.filter(_word_starts_with('title', prefix))
+

 
 def find_best_matches(query, user=None):
 
 def find_best_matches(query, user=None):

-    """ Finds a Book, Tag or Bookstub best matching a query.
+    """ Finds a models.Book, Tag, models.BookStub or Author best matching a query.

 
     Returns a with:
       - zero elements when nothing is found,
 
     Returns a with:
       - zero elements when nothing is found,


@@ -350,11 +399,21 @@ def find_best_matches(query, user=None):
         raise ValueError("query must have at least two characters")
 
     result = tuple(_tags_starting_with(query, user))
         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:
     exact_matches = tuple(res for res in result if res.name.lower() == query)
     if exact_matches:
         return exact_matches
     else:

-        return result[:1]
+        return tuple(result)[:1]

 
 
 def search(request):
 
 
 def search(request):


@@ -379,7 +438,9 @@ def search(request):
             {'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:
             {'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:

-        return render_to_response('catalogue/search_no_hits.html', {'tags':tag_list, 'prefix':prefix},
+        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))
 
 
             context_instance=RequestContext(request))
 
 


@@ -404,13 +465,14 @@ def json_tags_starting_with(request, callback=None):
     if len(prefix) < 2:
         return HttpResponse('')
     tags_list = []
     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:
     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)
             tags_list.append(tag.name)

-    dict_result = {"matches": tags_list}
-    return JSONResponse(dict_result, callback)
+    if request.GET.get('mozhint', ''):
+        result = [prefix, tags_list]
+    else:
+        result = {"matches": tags_list}
+    return JSONResponse(result, callback)

 
 # ====================
 # = Shelf management =
 
 # ====================
 # = Shelf management =


@@ -424,14 +486,18 @@ def user_shelves(request):
             context_instance=RequestContext(request))
 
 @cache.never_cache
             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)
-
+def book_sets(request, book):

     if not request.user.is_authenticated():
         return HttpResponse(_('<p>To maintain your shelves you need to be logged in.</p>'))
 
     if not request.user.is_authenticated():
         return HttpResponse(_('<p>To maintain your shelves you need to be logged in.</p>'))
 

+    kwargs = models.Book.split_urlid(book)
+    if kwargs is None:
+        raise Http404
+    book = get_object_or_404(models.Book, **kwargs)
+
+    user_sets = models.Tag.objects.filter(category='set', user=request.user)
+    book_sets = book.tags.filter(category='set', user=request.user)
+

     if request.method == 'POST':
         form = forms.ObjectSetsForm(book, request.user, request.POST)
         if form.is_valid():
     if request.method == 'POST':
         form = forms.ObjectSetsForm(book, request.user, request.POST)
         if form.is_valid():


@@ -439,16 +505,14 @@ def book_sets(request, slug):
             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]:
             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 = None
-                shelf.save()
+                touch_tag(shelf)

 
             for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:
 
             for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:

-                shelf.book_count = None
-                shelf.save()
+                touch_tag(shelf)

 
             book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
             if request.is_ajax():
 
             book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
             if request.is_ajax():

-                return HttpResponse(_('<p>Shelves were sucessfully saved.</p>'))
+                return JSONResponse('{"msg":"'+_("<p>Shelves were sucessfully saved.</p>")+'", "after":"close"}')

             else:
                 return HttpResponseRedirect('/')
     else:
             else:
                 return HttpResponseRedirect('/')
     else:


@@ -463,14 +527,16 @@ def book_sets(request, slug):
 @require_POST
 @cache.never_cache
 def remove_from_shelf(request, shelf, book):
 @require_POST
 @cache.never_cache
 def remove_from_shelf(request, shelf, book):

-    book = get_object_or_404(models.Book, slug=book)
+    kwargs = models.Book.split_urlid(book)
+    if kwargs is None:
+        raise Http404
+    book = get_object_or_404(models.Book, **kwargs)
+

     shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user)
 
     if shelf in book.tags:
         models.Tag.objects.remove_tag(book, shelf)
     shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user)
 
     if shelf in book.tags:
         models.Tag.objects.remove_tag(book, shelf)

-
-        shelf.book_count = None
-        shelf.save()
+        touch_tag(shelf)

 
         return HttpResponse(_('Book was successfully removed from the shelf'))
     else:
 
         return HttpResponse(_('Book was successfully removed from the shelf'))
     else:


@@ -497,6 +563,10 @@ def download_shelf(request, slug):
     without loading the whole file into memory. A similar approach can
     be used for large dynamic PDF files.
     """
     without loading the whole file into memory. A similar approach can
     be used for large dynamic PDF files.
     """

+    from slughifi import slughifi
+    import tempfile
+    import zipfile
+

     shelf = get_object_or_404(models.Tag, slug=slug, category='set')
 
     formats = []
     shelf = get_object_or_404(models.Tag, slug=slug, category='set')
 
     formats = []


@@ -504,35 +574,22 @@ def download_shelf(request, slug):
     if form.is_valid():
         formats = form.cleaned_data['formats']
     if len(formats) == 0:
     if form.is_valid():
         formats = form.cleaned_data['formats']
     if len(formats) == 0:

-        formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg']
+        formats = models.Book.ebook_formats

 
     # Create a ZIP archive
     temp = tempfile.TemporaryFile()
     archive = zipfile.ZipFile(temp, 'w')
 
     for book in collect_books(models.Book.tagged.with_all(shelf)):
 
     # Create a ZIP archive
     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 'epub' in formats and book.epub_file:
-            filename = book.epub_file.path
-            archive.write(filename, str('%s.epub' % 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))
+        fileid = book.fileid()
+        for ebook_format in models.Book.ebook_formats:
+            if ebook_format in formats and book.has_media(ebook_format):
+                filename = book.get_media(ebook_format).path
+                archive.write(filename, str('%s.%s' % (fileid, ebook_format)))

     archive.close()
 
     response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
     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-Disposition'] = 'attachment; filename=%s.zip' % slughifi(shelf.name)

     response['Content-Length'] = temp.tell()
 
     temp.seek(0)
     response['Content-Length'] = temp.tell()
 
     temp.seek(0)


@@ -547,21 +604,14 @@ def shelf_book_formats(request, shelf):
     """
     shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
 
     """
     shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
 

-    formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False}
+    formats = {}
+    for ebook_format in models.Book.ebook_formats:
+        formats[ebook_format] = False

 
     for book in collect_books(models.Book.tagged.with_all(shelf)):
 
     for book in collect_books(models.Book.tagged.with_all(shelf)):

-        if book.pdf_file:
-            formats['pdf'] = True
-        if book.epub_file:
-            formats['epub'] = 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
+        for ebook_format in models.Book.ebook_formats:
+            if book.has_media(ebook_format):
+                formats[ebook_format] = True

 
     return HttpResponse(LazyEncoder().encode(formats))
 
 
     return HttpResponse(LazyEncoder().encode(formats))
 


@@ -575,7 +625,7 @@ def new_set(request):
         new_set = new_set_form.save(request.user)
 
         if request.is_ajax():
         new_set = new_set_form.save(request.user)
 
         if request.is_ajax():

-            return HttpResponse(_('<p>Shelf <strong>%s</strong> was successfully created</p>') % new_set)
+            return JSONResponse('{"id":"%d", "name":"%s", "msg":"<p>Shelf <strong>%s</strong> was successfully created</p>"}' % (new_set.id, new_set.name, new_set))

         else:
             return HttpResponseRedirect('/')
 
         else:
             return HttpResponseRedirect('/')
 


@@ -595,45 +645,6 @@ def delete_shelf(request, slug):
         return HttpResponseRedirect('/')
 
 
         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': {}}
-    else:
-        response_data = {'success': False, 'errors': registration_form.errors}
-    return HttpResponse(LazyEncoder(ensure_ascii=False).encode(response_data))
-
-
-@cache.never_cache
-def logout_then_redirect(request):
-    auth.logout(request)
-    return HttpResponseRedirect(urlquote_plus(request.GET.get('next', '/'), safe='/?='))
-
-
-

 # =========
 # = Admin =
 # =========
 # =========
 # = Admin =
 # =========


@@ -646,6 +657,9 @@ def import_book(request):
         try:
             book_import_form.save()
         except:
         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]))
             info = sys.exc_info()
             exception = pprint.pformat(info[1])
             tb = '\n'.join(traceback.format_tb(info[2]))


@@ -655,10 +669,52 @@ def import_book(request):
         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, book=None):
+    kwargs = models.Book.split_fileid(book)
+
+    url = None
+    if format in models.Book.ebook_formats:
+        url = models.Book.zip_format(format)
+    elif format == 'audiobook' and kwargs is not None:
+        book = get_object_or_404(models.Book, **kwargs)
+        url = book.zip_audiobooks()
+    else:
+        raise Http404('No format specified for zip package')
+    return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
+
+
+def download_custom_pdf(request, book_fileid):
+    kwargs = models.Book.split_fileid(book_fileid)
+    if kwargs is None:
+        raise Http404
+    book = get_object_or_404(models.Book, **kwargs)
+
+    if request.method == 'GET':
+        form = forms.CustomPDFForm(request.GET)
+        if form.is_valid():
+            cust = form.customizations
+            pdf_file = models.get_customized_pdf_path(book, cust)
+                
+            if not path.exists(pdf_file):
+                result = async_build_pdf.delay(book.id, cust, pdf_file)
+                result.wait()
+            return AttachmentHttpResponse(file_name=("%s.pdf" % book_fileid), file_path=pdf_file, mimetype="application/pdf")
+        else:
+            raise Http404(_('Incorrect customization options for PDF'))
+    else:
+        raise Http404(_('Bad method'))