X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/76fc2ed0abc7ff4bb7ddee798a115f11bf51ee1c..938fc832934e508085dad3645c01060a4dc9f0c9:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index c34cf29c3..3a3283229 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -185,11 +185,8 @@ def tagged_object_list(request, tags=''): context_instance=RequestContext(request)) -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) +def book_fragments(request, slug, theme_slug): + book = get_object_or_404(models.Book, slug=slug) book_tag = book.book_tag() theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme') @@ -199,12 +196,9 @@ def book_fragments(request, book, theme_slug): context_instance=RequestContext(request)) -def book_detail(request, book): - kwargs = models.Book.split_urlid(book) - if kwargs is None: - raise Http404 +def book_detail(request, slug): try: - book = models.Book.objects.get(**kwargs) + book = models.Book.objects.get(slug=slug) except models.Book.DoesNotExist: return pdcounter_views.book_stub_detail(request, kwargs['slug']) @@ -228,28 +222,51 @@ 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, 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(): + 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)) -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) +def book_text(request, slug): + book = get_object_or_404(models.Book, slug=slug) if not book.has_html_file(): raise Http404 @@ -484,14 +501,11 @@ def user_shelves(request): context_instance=RequestContext(request)) @cache.never_cache -def book_sets(request, book): +def book_sets(request, slug): if not request.user.is_authenticated(): return HttpResponse(_('

To maintain your shelves you need to be logged in.

')) - kwargs = models.Book.split_urlid(book) - if kwargs is None: - raise Http404 - book = get_object_or_404(models.Book, **kwargs) + 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) @@ -524,11 +538,8 @@ def book_sets(request, book): @login_required @require_POST @cache.never_cache -def remove_from_shelf(request, shelf, book): - kwargs = models.Book.split_urlid(book) - if kwargs is None: - raise Http404 - book = get_object_or_404(models.Book, **kwargs) +def remove_from_shelf(request, shelf, slug): + book = get_object_or_404(models.Book, slug=slug) shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user) @@ -579,11 +590,10 @@ def download_shelf(request, slug): archive = zipfile.ZipFile(temp, 'w') for book in collect_books(models.Book.tagged.with_all(shelf)): - 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.write(filename, str('%s.%s' % (book.slug, ebook_format))) archive.close() response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed') @@ -682,25 +692,20 @@ def tag_info(request, id): return HttpResponse(tag.description) -def download_zip(request, format, book=None): - kwargs = models.Book.split_fileid(book) - +def download_zip(request, format, slug=None): 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() + 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='/?=')) -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) +def download_custom_pdf(request, slug): + book = get_object_or_404(models.Book, slug=slug) if request.method == 'GET': form = forms.CustomPDFForm(request.GET) @@ -711,7 +716,7 @@ def download_custom_pdf(request, book_fileid): 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") + return AttachmentHttpResponse(file_name=("%s.pdf" % book.slug), file_path=pdf_file, mimetype="application/pdf") else: raise Http404(_('Incorrect customization options for PDF')) else: