cotnent indexing - bugs.

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index c34cf29..34c9c1f 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -23,7 +23,8 @@ 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 ajaxable.utils import LazyEncoder, JSONResponse, AjaxableFormView
+

 from catalogue import models
 from catalogue import forms
 from catalogue.utils import (split_tags, AttachmentHttpResponse,
 from catalogue import models
 from catalogue import forms
 from catalogue.utils import (split_tags, AttachmentHttpResponse,


@@ -185,11 +186,8 @@ def tagged_object_list(request, tags=''):
         context_instance=RequestContext(request))
 
 
         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')
 
     book_tag = book.book_tag()
     theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme')


@@ -199,20 +197,17 @@ def book_fragments(request, book, theme_slug):
         context_instance=RequestContext(request))
 
 
         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:
     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'])
     except models.Book.DoesNotExist:
         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_children = book.children.all().order_by('parent_number', 'sort_key')
     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', 'sort_key')

-    
+

     _book = book
     parents = []
     while _book.parent:
     _book = book
     parents = []
     while _book.parent:


@@ -228,28 +223,51 @@ def book_detail(request, book):
     extra_info = book.get_extra_info_value()
     hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
 
     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()
     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
         # 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', '')))
         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)
 
     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))
 
 
         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
 
     if not book.has_html_file():
         raise Http404


@@ -437,7 +455,7 @@ def search(request):
             context_instance=RequestContext(request))
     else:
         form = PublishingSuggestForm(initial={"books": prefix + ", "})
             context_instance=RequestContext(request))
     else:
         form = PublishingSuggestForm(initial={"books": prefix + ", "})

-        return render_to_response('catalogue/search_no_hits.html', 
+        return render_to_response('catalogue/search_no_hits.html',

             {'tags':tag_list, 'prefix':prefix, "pubsuggest_form": form},
             context_instance=RequestContext(request))
 
             {'tags':tag_list, 'prefix':prefix, "pubsuggest_form": form},
             context_instance=RequestContext(request))
 


@@ -448,7 +466,7 @@ def tags_starting_with(request):
     if len(prefix) < 2:
         return HttpResponse('')
     tags_list = []
     if len(prefix) < 2:
         return HttpResponse('')
     tags_list = []

-    result = ""   
+    result = ""

     for tag in _tags_starting_with(prefix, request.user):
         if not tag.name in tags_list:
             result += "\n" + tag.name
     for tag in _tags_starting_with(prefix, request.user):
         if not tag.name in tags_list:
             result += "\n" + tag.name


@@ -484,14 +502,11 @@ def user_shelves(request):
             context_instance=RequestContext(request))
 
 @cache.never_cache
             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(_('<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)
+    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)
 
     user_sets = models.Tag.objects.filter(category='set', user=request.user)
     book_sets = book.tags.filter(category='set', user=request.user)


@@ -524,11 +539,8 @@ def book_sets(request, book):
 @login_required
 @require_POST
 @cache.never_cache
 @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)
 
 
     shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user)
 


@@ -579,11 +591,10 @@ def download_shelf(request, slug):
     archive = zipfile.ZipFile(temp, 'w')
 
     for book in collect_books(models.Book.tagged.with_all(shelf)):
     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
         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')
     archive.close()
 
     response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')


@@ -682,37 +693,50 @@ def tag_info(request, id):
     return HttpResponse(tag.description)
 
 
     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)
     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='/?='))
 
 
     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, method='GET'):
+    book = get_object_or_404(models.Book, slug=slug)

 
 

-    if request.method == 'GET':
-        form = forms.CustomPDFForm(request.GET)
+    if request.method == method:
+        form = forms.CustomPDFForm(method == 'GET' and request.GET or request.POST)

         if form.is_valid():
             cust = form.customizations
             pdf_file = models.get_customized_pdf_path(book, cust)
         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()
             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:
         raise Http404(_('Bad method'))
         else:
             raise Http404(_('Incorrect customization options for PDF'))
     else:
         raise Http404(_('Bad method'))

+
+
+class CustomPDFFormView(AjaxableFormView):
+    form_class = forms.CustomPDFForm
+    title = _('Download custom PDF')
+    submit = _('Download')
+
+    def __call__(self, request):
+        from copy import copy
+        if request.method == 'POST':
+            request.GET = copy(request.GET)
+            request.GET['next'] = "%s?%s" % (reverse('catalogue.views.download_custom_pdf', args=[request.GET['slug']]),
+                                             request.POST.urlencode())
+        return super(CustomPDFFormView, self).__call__(request)
+        
+
+    def success(self, *args):
+        pass