OPDS with new SOLR interface.

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index eb0e7b9..fc27e02 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -4,39 +4,30 @@
 #
 import re
 import itertools
 #
 import re
 import itertools

-from datetime import datetime

 
 from django.conf import settings
 from django.template import RequestContext
 
 from django.conf import settings
 from django.template import RequestContext

-from django.shortcuts import render_to_response, get_object_or_404
+from django.shortcuts import render_to_response, get_object_or_404, redirect

 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
 from django.core.urlresolvers import reverse
 from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect
 from django.core.urlresolvers import reverse

-from django.db.models import Count, Sum, Q
+from django.db.models import Q

 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.utils.datastructures import SortedDict
 from django.contrib.auth.decorators import login_required, user_passes_test
 from django.utils.datastructures import SortedDict

-from django.views.decorators.http import require_POST
-from django.contrib import auth
-from django.contrib.auth.forms import UserCreationForm, AuthenticationForm

 from django.utils.http import urlquote_plus
 from django.utils.http import urlquote_plus

-from django.views.decorators import cache

 from django.utils import translation
 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 _, ugettext_lazy
+from django.views.decorators.cache import never_cache

 
 

-from ajaxable.utils import LazyEncoder, JSONResponse, AjaxableFormView
+from ajaxable.utils import JSONResponse, AjaxableFormView

 
 from catalogue import models
 from catalogue import forms
 
 from catalogue import models
 from catalogue import forms

-from catalogue.utils import (split_tags, AttachmentHttpResponse,
-    async_build_pdf, MultiQuerySet)
-from catalogue.tasks import touch_tag
+from catalogue.utils import split_tags, MultiQuerySet

 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 pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from suggest.forms import PublishingSuggestForm
 from picture.models import Picture
 

-from os import path
-

 staff_required = user_passes_test(lambda user: user.is_staff)
 
 
 staff_required = user_passes_test(lambda user: user.is_staff)
 
 


@@ -102,8 +93,8 @@ def differentiate_tags(request, tags, ambiguous_slugs):
                 context_instance=RequestContext(request))
 
 
                 context_instance=RequestContext(request))
 
 

+@never_cache

 def tagged_object_list(request, tags=''):
 def tagged_object_list(request, tags=''):

-    #    import pdb; pdb.set_trace()

     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:
     try:
         tags = models.Tag.get_tag_list(tags)
     except models.Tag.DoesNotExist:


@@ -141,13 +132,14 @@ def tagged_object_list(request, tags=''):
 
         if shelf_tags:
             books = models.Book.tagged.with_all(shelf_tags).order_by()
 
         if shelf_tags:
             books = models.Book.tagged.with_all(shelf_tags).order_by()

-            l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books])
+            l_tags = models.Tag.objects.filter(category='book',
+                slug__in=[book.book_tag_slug() for book in books.iterator()])

             fragments = models.Fragment.tagged.with_any(l_tags, fragments)
 
         # newtagging goes crazy if we just try:
         #related_tags = models.Tag.objects.usage_for_queryset(fragments, counts=True,
         #                    extra={'where': ["catalogue_tag.category != 'book'"]})
             fragments = models.Fragment.tagged.with_any(l_tags, fragments)
 
         # newtagging goes crazy if we just try:
         #related_tags = models.Tag.objects.usage_for_queryset(fragments, counts=True,
         #                    extra={'where': ["catalogue_tag.category != 'book'"]})

-        fragment_keys = [fragment.pk for fragment in fragments]
+        fragment_keys = [fragment.pk for fragment in fragments.iterator()]

         if fragment_keys:
             related_tags = models.Fragment.tags.usage(counts=True,
                                 filters={'pk__in': fragment_keys},
         if fragment_keys:
             related_tags = models.Fragment.tags.usage(counts=True,
                                 filters={'pk__in': fragment_keys},


@@ -165,7 +157,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]
         # get related tags from `tag_counter` and `theme_counter`
         related_counts = {}
         tags_pks = [tag.pk for tag in tags]

-        for book in objects:
+        for book in objects.iterator():

             for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()):
                 if tag_pk in tags_pks:
                     continue
             for tag_pk, value in itertools.chain(book.tag_counter.iteritems(), book.theme_counter.iteritems()):
                 if tag_pk in tags_pks:
                     continue


@@ -194,6 +186,7 @@ def tagged_object_list(request, tags=''):
             'only_my_shelf': only_my_shelf,
             'formats_form': forms.DownloadFormatsForm(),
             'tags': tags,
             'only_my_shelf': only_my_shelf,
             'formats_form': forms.DownloadFormatsForm(),
             'tags': tags,

+            'theme_is_set': theme_is_set,

         },
         context_instance=RequestContext(request))
 
         },
         context_instance=RequestContext(request))
 


@@ -209,33 +202,14 @@ def book_fragments(request, slug, theme_slug):
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

+@never_cache

 def book_detail(request, slug):
     try:
         book = models.Book.objects.get(slug=slug)
     except models.Book.DoesNotExist:
 def book_detail(request, slug):
     try:
         book = models.Book.objects.get(slug=slug)
     except models.Book.DoesNotExist:

-        return pdcounter_views.book_stub_detail(request, kwargs['slug'])
+        return pdcounter_views.book_stub_detail(request, 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_children = book.children.all().order_by('parent_number', 'sort_key')

-
-    _book = book
-    parents = []
-    while _book.parent:
-        parents.append(_book.parent)
-        _book = _book.parent
-    parents = reversed(parents)
-
-    theme_counter = book.theme_counter
-    book_themes = models.Tag.objects.filter(pk__in=theme_counter.keys())
-    for tag in book_themes:
-        tag.count = theme_counter[tag.pk]
-
-    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))
 
     return render_to_response('catalogue/book_detail.html', locals(),
         context_instance=RequestContext(request))
 


@@ -246,15 +220,15 @@ def player(request, slug):
         raise Http404
 
     ogg_files = {}
         raise Http404
 
     ogg_files = {}

-    for m in book.media.filter(type='ogg').order_by():
+    for m in book.media.filter(type='ogg').order_by().iterator():

         ogg_files[m.name] = m
 
     audiobooks = []
     have_oggs = True
     projects = set()
         ogg_files[m.name] = m
 
     audiobooks = []
     have_oggs = True
     projects = set()

-    for mp3 in book.media.filter(type='mp3'):
+    for mp3 in book.media.filter(type='mp3').iterator():

         # ogg files are always from the same project
         # ogg files are always from the same project

-        meta = mp3.get_extra_info_value()
+        meta = mp3.extra_info

         project = meta.get('project')
         if not project:
             # temporary fallback
         project = meta.get('project')
         if not project:
             # temporary fallback


@@ -270,10 +244,11 @@ def player(request, slug):
         else:
             have_oggs = False
         audiobooks.append(media)
         else:
             have_oggs = False
         audiobooks.append(media)

-    print audiobooks

 
     projects = sorted(projects)
 
 
     projects = sorted(projects)
 

+    extra_info = book.extra_info
+

     return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
 
     return render_to_response('catalogue/player.html', locals(),
         context_instance=RequestContext(request))
 


@@ -284,12 +259,13 @@ def book_text(request, slug):
     if not book.has_html_file():
         raise Http404
     book_themes = {}
     if not book.has_html_file():
         raise Http404
     book_themes = {}

-    for fragment in book.fragments.all():
-        for theme in fragment.tags.filter(category='theme'):
+    for fragment in book.fragments.all().iterator():
+        for theme in fragment.tags.filter(category='theme').iterator():

             book_themes.setdefault(theme, []).append(fragment)
 
     book_themes = book_themes.items()
     book_themes.sort(key=lambda s: s[0].sort_key)
             book_themes.setdefault(theme, []).append(fragment)
 
     book_themes = book_themes.items()
     book_themes.sort(key=lambda s: s[0].sort_key)

+    related = book.related_info()

     return render_to_response('catalogue/book_text.html', locals(),
         context_instance=RequestContext(request))
 
     return render_to_response('catalogue/book_text.html', locals(),
         context_instance=RequestContext(request))
 


@@ -554,38 +530,23 @@ def download_zip(request, format, slug=None):
     return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
 
 
     return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))
 
 

-def download_custom_pdf(request, slug, method='GET'):
-    book = get_object_or_404(models.Book, slug=slug)
+class CustomPDFFormView(AjaxableFormView):
+    form_class = forms.CustomPDFForm
+    title = ugettext_lazy('Download custom PDF')
+    submit = ugettext_lazy('Download')
+    honeypot = True

 
 

-    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)
+    def __call__(self, *args, **kwargs):
+        if settings.NO_CUSTOM_PDF:
+            raise Http404('Custom PDF is disabled')
+        return super(CustomPDFFormView, self).__call__(*args, **kwargs)

 
 

-            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.slug), file_path=pdf_file, mimetype="application/pdf")
-        else:
-            raise Http404(_('Incorrect customization options for PDF'))
-    else:
-        raise Http404(_('Bad method'))
+    def form_args(self, request, obj):
+        """Override to parse view args and give additional args to the form."""
+        return (obj,), {}

 
 

+    def get_object(self, request, slug, *args, **kwargs):
+        return get_object_or_404(models.Book, slug=slug)

 
 

-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
+    def context_description(self, request, obj):
+        return obj.pretty_title()