X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/e9cd7fc641895a7702a8f81fcd11c388dd7d9db7..4b6fc6dc545a10955094bfaa9448ba070cfb33bf:/apps/catalogue/views.py?ds=sidebyside

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index f1eeab739..90fe22fd0 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -26,14 +26,14 @@ 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.utils import split_tags, AttachmentHttpResponse, async_build_pdf
+from catalogue.utils import (split_tags, AttachmentHttpResponse,
+    async_build_pdf, MultiQuerySet)
 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)
@@ -169,22 +169,20 @@ def tagged_object_list(request, tags=''):
         only_author = len(tags) == 1 and tags[0].category == 'author'
         objects = models.Book.objects.none()
 
-        # Add pictures
-    objects = Picture.tagged.with_all(tags)|objects
+    # Add pictures
+    objects = MultiQuerySet(Picture.tagged.with_all(tags), objects)
 
-    return object_list(
-        request,
-        objects,
-        template_name='catalogue/tagged_object_list.html',
-        extra_context={
+    return render_to_response('catalogue/tagged_object_list.html',
+        {
+            'object_list': objects,
             'categories': categories,
             'only_shelf': only_shelf,
             'only_author': only_author,
             'only_my_shelf': only_my_shelf,
             'formats_form': forms.DownloadFormatsForm(),
             'tags': tags,
-        }
-    )
+        },
+        context_instance=RequestContext(request))
 
 
 def book_fragments(request, book, theme_slug):
@@ -230,20 +228,49 @@ def book_detail(request, book):
     extra_info = book.get_extra_info_value()
     hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
 
+    custom_pdf_form = forms.CustomPDFForm()
+    return render_to_response('catalogue/book_detail.html', locals(),
+        context_instance=RequestContext(request))
+
+
+def player(request, book):
+    kwargs = models.Book.split_urlid(book)
+    if kwargs is None:
+        raise Http404
+    book = get_object_or_404(models.Book, **kwargs)
+    if not book.has_media('mp3'):
+        raise Http404
+
+    ogg_files = {}
+    for m in book.media.filter(type='ogg').order_by():
+        ogg_files[m.name] = m
+
+    audiobooks = []
+    have_oggs = True
     projects = set()
-    for m in book.media.filter(type='mp3'):
+    for mp3 in book.media.filter(type='mp3'):
         # ogg files are always from the same project
-        meta = m.get_extra_info_value()
+        meta = mp3.get_extra_info_value()
         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)
+    print audiobooks
+
     projects = sorted(projects)
 
-    custom_pdf_form = forms.CustomPDFForm()
-    return render_to_response('catalogue/book_detail.html', locals(),
+    return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
 
 
@@ -690,9 +717,9 @@ def download_zip(request, format, book=None):
     url = None
     if format in models.Book.ebook_formats:
         url = models.Book.zip_format(format)
-    elif format == 'audiobook' and kwargs is not None:
+    elif format in ('mp3', 'ogg') and kwargs is not None:
         book = get_object_or_404(models.Book, **kwargs)
-        url = book.zip_audiobooks()
+        url = book.zip_audiobooks(format)
     else:
         raise Http404('No format specified for zip package')
     return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))