Merge branch 'master' into obrazy

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 92ecebf..2acafcf 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -17,7 +17,7 @@ from django.contrib.auth.decorators import login_required, user_passes_test
 from django.utils.datastructures import SortedDict
 from django.utils.http import urlquote_plus
 from django.utils import translation
-from django.utils.translation import ugettext as _, ugettext_lazy
+from django.utils.translation import get_language, ugettext as _, ugettext_lazy
 from django.views.decorators.vary import vary_on_headers
 
 from ajaxable.utils import JSONResponse, AjaxableFormView
@@ -29,6 +29,7 @@ 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 picture.views import picture_list_thumb
 
 staff_required = user_passes_test(lambda user: user.is_staff)
 permanent_cache = get_cache('permanent')
@@ -36,22 +37,38 @@ permanent_cache = get_cache('permanent')
 
 @vary_on_headers('X-Requested-With')
 def catalogue(request):
-    cache_key='catalogue.catalogue'
+    cache_key='catalogue.catalogue/' + get_language()
     output = permanent_cache.get(cache_key)
+
     if output is None:
         tags = models.Tag.objects.exclude(
-            category__in=('set', 'book')).exclude(book_count=0)
+            category__in=('set', 'book')).exclude(book_count=0, picture_count=0)
         tags = list(tags)
         for tag in tags:
-            tag.count = tag.book_count
+            tag.count = tag.book_count + tag.picture_count
         categories = split_tags(tags)
         fragment_tags = categories.get('theme', [])
         collections = models.Collection.objects.all()
+
         render_tag_list = lambda x: render_to_string(
             'catalogue/tag_list.html', tag_list(x))
-        output = {'theme': render_tag_list(fragment_tags)}
+        has_pictures = lambda x: filter(lambda y: y.picture_count>0, x)
+        has_books = lambda x: filter(lambda y: y.book_count>0, x)
+        def render_split(tags):
+            with_books = has_books(tags)
+            with_pictures = has_pictures(tags)
+            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 = {'theme': {}}
+        output['theme'] = render_split(fragment_tags)
         for category, tags in categories.items():
-            output[category] = render_tag_list(tags)
+            output[category] = render_split(tags)
+            
         output['collections'] = render_to_string(
             'catalogue/collection_list.html', collection_list(collections))
         permanent_cache.set(cache_key, output)
@@ -70,6 +87,7 @@ def book_list(request, filter=None, get_filter=None,
         context=None,
         ):
     """ generates a listing of all books, optionally filtered with a test function """
+    cache_key = "%s/%s" % (cache_key, get_language())
     cached = permanent_cache.get(cache_key)
     if cached is not None:
         rendered_nav, rendered_book_list = cached
@@ -103,14 +121,16 @@ def daisy_list(request):
 
 def collection(request, slug):
     coll = get_object_or_404(models.Collection, slug=slug)
-    def get_filter():
-        slugs = coll.book_slugs.split()
-        # allow URIs
-        slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug
-                    for slug in slugs]
-        return Q(slug__in=slugs)
-    return book_list(request, get_filter=get_filter,
-                     template_name='catalogue/collection.html',
+    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,
                      cache_key='catalogue.collection:%s' % coll.slug,
                      context={'collection': coll})
 
@@ -192,7 +212,7 @@ def tagged_object_list(request, tags=''):
         # get related tags from `tag_counter` and `theme_counter`
         related_counts = {}
         tags_pks = [tag.pk for tag in tags]
-        for book in objects.iterator():
+        for book in objects:
             for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()):
                 if tag_pk in tags_pks:
                     continue