Auth+cache fixess

[wolnelektury.git] / src / catalogue / templatetags / catalogue_tags.py

diff --git a/src/catalogue/templatetags/catalogue_tags.py b/src/catalogue/templatetags/catalogue_tags.py
index 6e81cae..263f12c 100644 (file)
--- a/src/catalogue/templatetags/catalogue_tags.py
+++ b/src/catalogue/templatetags/catalogue_tags.py
@@ -4,35 +4,27 @@
 #
 from random import randint, random
 from urlparse import urlparse
 #
 from random import randint, random
 from urlparse import urlparse

+from django.contrib.contenttypes.models import ContentType

 
 from django.conf import settings
 from django import template
 from django.template import Node, Variable, Template, Context
 from django.core.urlresolvers import reverse
 
 from django.conf import settings
 from django import template
 from django.template import Node, Variable, Template, Context
 from django.core.urlresolvers import reverse

-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm

 from django.utils.cache import add_never_cache_headers
 from django.utils.cache import add_never_cache_headers

+from django.utils.safestring import mark_safe

 from django.utils.translation import ugettext as _
 
 from ssify import ssi_variable
 from django.utils.translation import ugettext as _
 
 from ssify import ssi_variable

+
+from catalogue.helpers import get_audiobook_tags

 from catalogue.models import Book, BookMedia, Fragment, Tag, Source
 from catalogue.constants import LICENSES
 from catalogue.models import Book, BookMedia, Fragment, Tag, Source
 from catalogue.constants import LICENSES

+from paypal.rest import user_is_subscribed

 from picture.models import Picture
 
 register = template.Library()
 
 
 from picture.models import Picture
 
 register = template.Library()
 
 

-class RegistrationForm(UserCreationForm):
-    def as_ul(self):
-        "Returns this form rendered as HTML <li>s -- excluding the <ul></ul>."
-        return self._html_output(u'<li>%(errors)s%(label)s %(field)s<span class="help-text">%(help_text)s</span></li>', u'<li>%s</li>', '</li>', u' %s', False)
-
-
-class LoginForm(AuthenticationForm):
-    def as_ul(self):
-        "Returns this form rendered as HTML <li>s -- excluding the <ul></ul>."
-        return self._html_output(u'<li>%(errors)s%(label)s %(field)s<span class="help-text">%(help_text)s</span></li>', u'<li>%s</li>', '</li>', u' %s', False)
-
-

 def iterable(obj):
     try:
         iter(obj)
 def iterable(obj):
     try:
         iter(obj)


@@ -66,7 +58,7 @@ def simple_title(tags):
 
 @register.simple_tag
 def book_title(book, html_links=False):
 
 @register.simple_tag
 def book_title(book, html_links=False):

-    return book.pretty_title(html_links)
+    return mark_safe(book.pretty_title(html_links))

 
 
 @register.simple_tag
 
 
 @register.simple_tag


@@ -107,8 +99,8 @@ def title_from_tags(tags):
     # Specjalny przypadek "Dramat w twórczości Sofoklesa", wtedy gdy podane
     # są tylko rodzaj literacki i autor
     if 'kind' in self and 'author' in self and len(self) == 2:
     # Specjalny przypadek "Dramat w twórczości Sofoklesa", wtedy gdy podane
     # są tylko rodzaj literacki i autor
     if 'kind' in self and 'author' in self and len(self) == 2:

-        text = u'%s w twórczości %s' % (unicode(self['kind']),
-            flection.get_case(unicode(self['author']), u'dopełniacz'))
+        text = u'%s w twórczości %s' % (
+            unicode(self['kind']), flection.get_case(unicode(self['author']), u'dopełniacz'))

         return capfirst(text)
 
     # Przypadki ogólniejsze
         return capfirst(text)
 
     # Przypadki ogólniejsze


@@ -145,24 +137,27 @@ def book_tree(book_list, books_by_parent):
         ) for book in book_list)
 
     if text:
         ) for book in book_list)
 
     if text:

-        return "<ol>%s</ol>" % text
+        return mark_safe("<ol>%s</ol>" % text)

     else:
         return ''
 
     else:
         return ''
 

+

 @register.simple_tag
 def audiobook_tree(book_list, books_by_parent):
     text = "".join("<li><a class='open-player' href='%s'>%s</a>%s</li>" % (
 @register.simple_tag
 def audiobook_tree(book_list, books_by_parent):
     text = "".join("<li><a class='open-player' href='%s'>%s</a>%s</li>" % (

-        reverse("book_player", args=[book.slug]), book.title, audiobook_tree(books_by_parent.get(book, ()), books_by_parent)
-        ) for book in book_list)
+        reverse("book_player", args=[book.slug]), book.title,
+        audiobook_tree(books_by_parent.get(book, ()), books_by_parent)
+    ) for book in book_list)

 
     if text:
 
     if text:

-        return "<ol>%s</ol>" % text
+        return mark_safe("<ol>%s</ol>" % text)

     else:
         return ''
 
     else:
         return ''
 

+

 @register.simple_tag
 def book_tree_texml(book_list, books_by_parent, depth=1):
 @register.simple_tag
 def book_tree_texml(book_list, books_by_parent, depth=1):

-    return "".join("""
+    return mark_safe("".join("""

             <cmd name='hspace'><parm>%(depth)dem</parm></cmd>%(title)s
             <spec cat='align' /><cmd name="note"><parm>%(audiences)s</parm></cmd>
             <spec cat='align' /><cmd name="note"><parm>%(audiobook)s</parm></cmd>
             <cmd name='hspace'><parm>%(depth)dem</parm></cmd>%(title)s
             <spec cat='align' /><cmd name="note"><parm>%(audiences)s</parm></cmd>
             <spec cat='align' /><cmd name="note"><parm>%(audiobook)s</parm></cmd>


@@ -174,7 +169,7 @@ def book_tree_texml(book_list, books_by_parent, depth=1):
                 "audiences": ", ".join(book.audiences_pl()),
                 "audiobook": "audiobook" if book.has_media('mp3') else "",
                 "children": book_tree_texml(books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
                 "audiences": ", ".join(book.audiences_pl()),
                 "audiobook": "audiobook" if book.has_media('mp3') else "",
                 "children": book_tree_texml(books_by_parent.get(book.id, ()), books_by_parent, depth + 1)

-            } for book in book_list)
+            } for book in book_list))

 
 
 @register.simple_tag
 
 
 @register.simple_tag


@@ -187,7 +182,7 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
         except ValueError:
             return s
 
         except ValueError:
             return s
 

-    return "".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s
+    return mark_safe("".join("""%(author)s%(d)s%(preindent)s%(title)s%(d)s%(postindent)s%(audiences)s%(d)s%(audiobook)s

 %(children)s""" % {
                 "d": delimeter,
                 "preindent": delimeter * (depth - 1),
 %(children)s""" % {
                 "d": delimeter,
                 "preindent": delimeter * (depth - 1),


@@ -198,7 +193,8 @@ def book_tree_csv(author, book_list, books_by_parent, depth=1, max_depth=3, deli
                 "audiences": ", ".join(book.audiences_pl()),
                 "audiobook": "audiobook" if book.has_media('mp3') else "",
                 "children": book_tree_csv(author, books_by_parent.get(book.id, ()), books_by_parent, depth + 1)
                 "audiences": ", ".join(book.audiences_pl()),
                 "audiobook": "audiobook" if book.has_media('mp3') else "",
                 "children": book_tree_csv(author, books_by_parent.get(book.id, ()), books_by_parent, depth + 1)

-            } for book in book_list)
+            } for book in book_list))
+

 
 @register.simple_tag
 def all_editors(extra_info):
 
 @register.simple_tag
 def all_editors(extra_info):


@@ -217,37 +213,29 @@ def all_editors(extra_info):
                      for person in sorted(set(editors)))
 
 
                      for person in sorted(set(editors)))
 
 

-@register.simple_tag
-def user_creation_form():
-    return RegistrationForm(prefix='registration').as_ul()
-
-
-@register.simple_tag
-def authentication_form():
-    return LoginForm(prefix='login').as_ul()
-
-

 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()
 
     tags_to_add = []
     tags_to_remove = []
 @register.tag
 def catalogue_url(parser, token):
     bits = token.split_contents()
 
     tags_to_add = []
     tags_to_remove = []

-    for bit in bits[1:]:
+    for bit in bits[2:]:

         if bit[0] == '-':
             tags_to_remove.append(bit[1:])
         else:
             tags_to_add.append(bit)
 
         if bit[0] == '-':
             tags_to_remove.append(bit[1:])
         else:
             tags_to_add.append(bit)
 

-    return CatalogueURLNode(tags_to_add, tags_to_remove)
+    return CatalogueURLNode(bits[1], tags_to_add, tags_to_remove)

 
 
 class CatalogueURLNode(Node):
 
 
 class CatalogueURLNode(Node):

-    def __init__(self, tags_to_add, tags_to_remove):
+    def __init__(self, list_type, tags_to_add, tags_to_remove):

         self.tags_to_add = [Variable(tag) for tag in tags_to_add]
         self.tags_to_remove = [Variable(tag) for tag in tags_to_remove]
         self.tags_to_add = [Variable(tag) for tag in tags_to_add]
         self.tags_to_remove = [Variable(tag) for tag in tags_to_remove]

+        self.list_type_var = Variable(list_type)

 
     def render(self, context):
 
     def render(self, context):

+        list_type = self.list_type_var.resolve(context)

         tags_to_add = []
         tags_to_remove = []
 
         tags_to_add = []
         tags_to_remove = []
 


@@ -273,28 +261,67 @@ class CatalogueURLNode(Node):
                 pass
 
         if len(tag_slugs) > 0:
                 pass
 
         if len(tag_slugs) > 0:

-            return reverse('tagged_object_list', kwargs={'tags': '/'.join(tag_slugs)})
+            if list_type == 'gallery':
+                return reverse('tagged_object_list_gallery', kwargs={'tags': '/'.join(tag_slugs)})
+            elif list_type == 'audiobooks':
+                return reverse('tagged_object_list_audiobooks', kwargs={'tags': '/'.join(tag_slugs)})
+            else:
+                return reverse('tagged_object_list', kwargs={'tags': '/'.join(tag_slugs)})

         else:
         else:

-            return reverse('main_page')
+            if list_type == 'gallery':
+                return reverse('gallery')
+            elif list_type == 'audiobooks':
+                return reverse('audiobook_list')
+            else:
+                return reverse('book_list')

 
 
 
 

-@register.inclusion_tag('catalogue/tag_list.html')
-def tag_list(tags, choices=None):
+# @register.inclusion_tag('catalogue/tag_list.html')
+def tag_list(tags, choices=None, category=None, list_type='books'):
+    # print(tags, choices, category)

     if choices is None:
         choices = []
     if choices is None:
         choices = []

-    if len(tags) == 1 and tags[0].category not in [t.category for t in choices]:
+
+    if category is None and tags:
+        category = tags[0].category
+
+    category_choices = [tag for tag in choices if tag.category == category]
+
+    if len(tags) == 1 and category not in [t.category for t in choices]:

         one_tag = tags[0]
         one_tag = tags[0]

-    return locals()
+    else:
+        one_tag = None
+
+    if category is not None:
+        other = Tag.objects.filter(category=category).exclude(pk__in=[t.pk for t in tags])\
+            .exclude(pk__in=[t.pk for t in category_choices])
+        # Filter out empty tags.
+        ct = ContentType.objects.get_for_model(Picture if list_type == 'gallery' else Book)
+        other = other.filter(items__content_type=ct).distinct()
+        if list_type == 'audiobooks':
+            other = other.filter(id__in=get_audiobook_tags())
+        other = other.only('name', 'slug', 'category')
+    else:
+        other = []
+
+    return {
+        'one_tag': one_tag,
+        'choices': choices,
+        'category_choices': category_choices,
+        'tags': tags,
+        'other': other,
+        'list_type': list_type,
+    }

 
 
 @register.inclusion_tag('catalogue/inline_tag_list.html')
 
 
 @register.inclusion_tag('catalogue/inline_tag_list.html')

-def inline_tag_list(tags, choices=None):
-    return tag_list(tags, choices)
+def inline_tag_list(tags, choices=None, category=None, list_type='books'):
+    return tag_list(tags, choices, category, list_type)

 
 
 @register.inclusion_tag('catalogue/collection_list.html')
 def collection_list(collections):
 
 
 @register.inclusion_tag('catalogue/collection_list.html')
 def collection_list(collections):

-    return locals()
+    return {'collections': collections}

 
 
 @register.inclusion_tag('catalogue/book_info.html')
 
 
 @register.inclusion_tag('catalogue/book_info.html')


@@ -308,13 +335,43 @@ def book_info(book):
 @register.inclusion_tag('catalogue/work-list.html', takes_context=True)
 def work_list(context, object_list):
     request = context.get('request')
 @register.inclusion_tag('catalogue/work-list.html', takes_context=True)
 def work_list(context, object_list):
     request = context.get('request')

-    return locals()
+    return {'object_list': object_list, 'request': request}
+
+
+@register.inclusion_tag('catalogue/plain_list.html', takes_context=True)
+def plain_list(context, object_list, with_initials=True, by_author=False, choice=None, book=None, list_type='books',
+               paged=True, initial_blocks=False):
+    names = [('', [])]
+    last_initial = None
+    if len(object_list) < settings.CATALOGUE_MIN_INITIALS and not by_author:
+        with_initials = False
+        initial_blocks = False
+    for obj in object_list:
+        if with_initials:
+            if by_author:
+                initial = obj.sort_key_author
+            else:
+                initial = obj.get_initial().upper()
+            if initial != last_initial:
+                last_initial = initial
+                names.append((obj.author_unicode() if by_author else initial, []))
+        names[-1][1].append(obj)
+    if names[0] == ('', []):
+        del names[0]
+    return {
+        'paged': paged,
+        'names': names,
+        'initial_blocks': initial_blocks,
+        'book': book,
+        'list_type': list_type,
+        'choice': choice,
+    }

 
 
 # TODO: These are no longer just books.
 @register.inclusion_tag('catalogue/related_books.html', takes_context=True)
 def related_books(context, instance, limit=6, random=1, taken=0):
 
 
 # TODO: These are no longer just books.
 @register.inclusion_tag('catalogue/related_books.html', takes_context=True)
 def related_books(context, instance, limit=6, random=1, taken=0):

-    limit = limit - taken
+    limit -= taken

     max_books = limit - random
     is_picture = isinstance(instance, Picture)
 
     max_books = limit - random
     is_picture = isinstance(instance, Picture)
 


@@ -347,33 +404,19 @@ def related_books(context, instance, limit=6, random=1, taken=0):
     }
 
 
     }
 
 

-@register.inclusion_tag('catalogue/menu.html')
-def catalogue_menu():
-    return {'categories': [
-                ('author', _('Authors'), 'autorzy'),
-                ('genre', _('Genres'), 'gatunki'),
-                ('kind', _('Kinds'), 'rodzaje'),
-                ('epoch', _('Epochs'), 'epoki'),
-                ('theme', _('Themes'), 'motywy'),
-        ]}
-
-

 @register.simple_tag
 @register.simple_tag

-def download_audio(book, daisy=True):
+def download_audio(book, daisy=True, mp3=True):

     links = []
     links = []

-    if book.has_media('mp3'):
-        links.append("<a href='%s'>%s</a>" %
-            (reverse('download_zip_mp3', args=[book.slug]),
-                BookMedia.formats['mp3'].name))
+    if mp3 and book.has_media('mp3'):
+        links.append("<a href='%s'>%s</a>" % (
+            reverse('download_zip_mp3', args=[book.slug]), BookMedia.formats['mp3'].name))

     if book.has_media('ogg'):
     if book.has_media('ogg'):

-        links.append("<a href='%s'>%s</a>" %
-            (reverse('download_zip_ogg', args=[book.slug]),
-                BookMedia.formats['ogg'].name))
+        links.append("<a href='%s'>%s</a>" % (
+            reverse('download_zip_ogg', args=[book.slug]), BookMedia.formats['ogg'].name))

     if daisy and book.has_media('daisy'):
         for dsy in book.get_media('daisy'):
     if daisy and book.has_media('daisy'):
         for dsy in book.get_media('daisy'):

-            links.append("<a href='%s'>%s</a>" %
-                (dsy.file.url, BookMedia.formats['daisy'].name))
-    return ", ".join(links)
+            links.append("<a href='%s'>%s</a>" % (dsy.file.url, BookMedia.formats['daisy'].name))
+    return mark_safe("".join(links))

 
 
 @register.inclusion_tag("catalogue/snippets/custom_pdf_link_li.html")
 
 
 @register.inclusion_tag("catalogue/snippets/custom_pdf_link_li.html")


@@ -443,3 +486,20 @@ def choose_fragment(request, book_id=None, tag_ids=None, unless=False):
         fragment_count = fragments.count()
         fragment = fragments[randint(0, fragment_count - 1)] if fragment_count else None
     return fragment.pk if fragment is not None else None
         fragment_count = fragments.count()
         fragment = fragments[randint(0, fragment_count - 1)] if fragment_count else None
     return fragment.pk if fragment is not None else None

+
+
+@register.filter
+def strip_tag(html, tag_name):
+    # docelowo może być warto zainstalować BeautifulSoup do takich rzeczy
+    import re
+    return re.sub(r"<.?%s\b[^>]*>" % tag_name, "", html)
+
+
+@register.filter
+def status(book, user):
+    if not book.preview:
+        return 'open'
+    elif user_is_subscribed(user):
+        return 'preview'
+    else:
+        return 'closed'