fabfile change

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 5de0e9d..5c0f209 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -15,9 +15,9 @@ from datetime import datetime
 from django.conf import settings
 from django.template import RequestContext
 from django.shortcuts import render_to_response, get_object_or_404
 from django.conf import settings
 from django.template import RequestContext
 from django.shortcuts import render_to_response, get_object_or_404

-from django.http import HttpResponse, HttpResponseRedirect, Http404
+from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect

 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse

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

 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.auth.decorators import login_required, user_passes_test
 from django.utils.datastructures import SortedDict
 from django.views.decorators.http import require_POST


@@ -28,6 +28,7 @@ from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
 from django.utils.http import urlquote_plus
 from django.views.decorators import cache
 from django.utils.encoding import force_unicode
 from django.utils.http import urlquote_plus
 from django.views.decorators import cache

+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
 


@@ -37,6 +38,7 @@ from catalogue.utils import split_tags
 from newtagging import views as newtagging_views
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views
 from newtagging import views as newtagging_views
 from pdcounter import models as pdcounter_models
 from pdcounter import views as pdcounter_views

+from suggest.forms import PublishingSuggestForm

 from slughifi import slughifi
 
 
 from slughifi import slughifi
 
 


@@ -82,7 +84,7 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'):
     form = forms.SearchForm()
 
     books_by_parent = {}
     form = forms.SearchForm()
 
     books_by_parent = {}

-    books = models.Book.objects.all().order_by('parent_number', 'title').only('title', 'parent', 'slug')
+    books = models.Book.objects.all().order_by('parent_number', 'sort_key').only('title', 'parent', 'slug')

     if filter:
         books = books.filter(filter).distinct()
         book_ids = set((book.pk for book in books))
     if filter:
         books = books.filter(filter).distinct()
         book_ids = set((book.pk for book in books))


@@ -118,12 +120,12 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'):
 
 
 def audiobook_list(request):
 
 
 def audiobook_list(request):

-    return book_list(request, Q(medias__type='mp3') | Q(medias__type='ogg'),
+    return book_list(request, Q(media__type='mp3') | Q(media__type='ogg'),

                      template_name='catalogue/audiobook_list.html')
 
 
 def daisy_list(request):
                      template_name='catalogue/audiobook_list.html')
 
 
 def daisy_list(request):

-    return book_list(request, Q(medias__type='daisy'),
+    return book_list(request, Q(media__type='daisy'),

                      template_name='catalogue/daisy_list.html')
 
 
                      template_name='catalogue/daisy_list.html')
 
 


@@ -141,7 +143,7 @@ def differentiate_tags(request, tags, ambiguous_slugs):
                 context_instance=RequestContext(request))
 
 
                 context_instance=RequestContext(request))
 
 

-def tagged_object_list(request, tags='', api=False):
+def tagged_object_list(request, tags=''):

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


@@ -152,6 +154,8 @@ def tagged_object_list(request, tags='', api=False):
             raise Http404
     except models.Tag.MultipleObjectsReturned, e:
         return differentiate_tags(request, e.tags, e.ambiguous_slugs)
             raise Http404
     except models.Tag.MultipleObjectsReturned, e:
         return differentiate_tags(request, e.tags, e.ambiguous_slugs)

+    except models.Tag.UrlDeprecationWarning, e:
+        return HttpResponsePermanentRedirect(reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)]))

 
     try:
         if len(tags) > settings.MAX_TAG_LIST:
 
     try:
         if len(tags) > settings.MAX_TAG_LIST:


@@ -193,14 +197,10 @@ def tagged_object_list(request, tags='', api=False):
 
             objects = fragments
     else:
 
             objects = fragments
     else:

-        # get relevant books and their tags
-        objects = models.Book.tagged.with_all(tags)
-        if not shelf_is_set:
-            # eliminate descendants
-            l_tags = models.Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in objects])
-            descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)]
-            if descendants_keys:
-                objects = objects.exclude(pk__in=descendants_keys)
+        if shelf_is_set:
+            objects = models.Book.tagged.with_all(tags)
+        else:
+            objects = models.Book.tagged_top_level(tags)

 
         # get related tags from `tag_counter` and `theme_counter`
         related_counts = {}
 
         # get related tags from `tag_counter` and `theme_counter`
         related_counts = {}


@@ -222,23 +222,19 @@ def tagged_object_list(request, tags='', api=False):
         only_author = len(tags) == 1 and tags[0].category == 'author'
         objects = models.Book.objects.none()
 
         only_author = len(tags) == 1 and tags[0].category == 'author'
         objects = models.Book.objects.none()
 

-    if api:
-        print objects
-        return objects    
-    else:
-        return object_list(
-            request,
-            objects,
-            template_name='catalogue/tagged_object_list.html',
-            extra_context={
-                'categories': categories,
-                'only_shelf': only_shelf,
-                'only_author': only_author,
-                'only_my_shelf': only_my_shelf,
-                'formats_form': forms.DownloadFormatsForm(),
-                'tags': tags,
-            }
-        )
+    return object_list(
+        request,
+        objects,
+        template_name='catalogue/tagged_object_list.html',
+        extra_context={
+            'categories': categories,
+            'only_shelf': only_shelf,
+            'only_author': only_author,
+            'only_my_shelf': only_my_shelf,
+            'formats_form': forms.DownloadFormatsForm(),
+            'tags': tags,
+        }
+    )

 
 
 def book_fragments(request, book_slug, theme_slug):
 
 
 def book_fragments(request, book_slug, theme_slug):


@@ -261,7 +257,7 @@ def book_detail(request, slug):
     book_tag = book.book_tag()
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
     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', 'title')
+    book_children = book.children.all().order_by('parent_number', 'sort_key')

     
     _book = book
     parents = []
     
     _book = book
     parents = []


@@ -276,6 +272,19 @@ def book_detail(request, slug):
         tag.count = theme_counter[tag.pk]
 
     extra_info = book.get_extra_info_value()
         tag.count = theme_counter[tag.pk]
 
     extra_info = book.get_extra_info_value()

+    hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl')
+
+    projects = set()
+    for m in book.media.filter(type='mp3'):
+        # ogg files are always from the same project
+        meta = m.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', '')))
+    projects = sorted(projects)

 
     form = forms.SearchForm()
     return render_to_response('catalogue/book_detail.html', locals(),
 
     form = forms.SearchForm()
     return render_to_response('catalogue/book_detail.html', locals(),


@@ -469,7 +478,9 @@ def search(request):
             {'tags':tag_list, 'prefix':prefix, 'results':((x, _get_result_link(x, tag_list), _get_result_type(x)) for x in result)},
             context_instance=RequestContext(request))
     else:
             {'tags':tag_list, 'prefix':prefix, 'results':((x, _get_result_link(x, tag_list), _get_result_type(x)) for x in result)},
             context_instance=RequestContext(request))
     else:

-        return render_to_response('catalogue/search_no_hits.html', {'tags':tag_list, 'prefix':prefix},
+        form = PublishingSuggestForm(initial={"books": prefix + ", "})
+        return render_to_response('catalogue/search_no_hits.html', 
+            {'tags':tag_list, 'prefix':prefix, "pubsuggest_form": form},

             context_instance=RequestContext(request))
 
 
             context_instance=RequestContext(request))
 
 


@@ -683,27 +694,6 @@ def delete_shelf(request, slug):
 # ==================
 # = Authentication =
 # ==================
 # ==================
 # = Authentication =
 # ==================

-
-@cache.never_cache
-def simple_login(request):
-    if request.method == "GET":
-        #next = request.REQUEST.get('next', '')
-        #if next == '':
-        form = AuthenticationForm(prefix='login')
-        return render_to_response('auth/login.html', locals(),
-                context_instance=RequestContext(request))
-        #else:
-        #    return HttpResponseRedirect("/"+next)
-            
-    elif request.method == "POST":
-        form = AuthenticationForm(data=request.POST, prefix='login')
-        if form.is_valid():
-            auth.login(request, form.get_user())   
-        url = request.META['HTTP_REFERER'].split("next=")[1]
-        url = url.replace("%3F","?").replace("%3D","=")
-        return HttpResponseRedirect(url)    
-
-

 @require_POST
 @cache.never_cache
 def login(request):
 @require_POST
 @cache.never_cache
 def login(request):


@@ -769,23 +759,15 @@ def clock(request):
     return HttpResponse(datetime.now().strftime('%Y/%m/%d %H:%M:%S'))
 
 
     return HttpResponse(datetime.now().strftime('%Y/%m/%d %H:%M:%S'))
 
 

-@cache.never_cache
-def xmls(request):
-    """"
-    Create a zip archive with all XML files.
-    This should be removed when we have real API.
-    """
-    temp = tempfile.TemporaryFile()
-    archive = zipfile.ZipFile(temp, 'w')
-
-    for book in models.Book.objects.all():
-        archive.write(book.xml_file.path, str('%s.xml' % book.slug))
-    archive.close()
+# info views for API

 
 

-    response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
-    response['Content-Disposition'] = 'attachment; filename=xmls.zip'
-    response['Content-Length'] = temp.tell()
+def book_info(request, id, lang='pl'):
+    book = get_object_or_404(models.Book, id=id)
+    # set language by hand
+    translation.activate(lang)
+    return render_to_response('catalogue/book_info.html', locals(),
+        context_instance=RequestContext(request))

 
 

-    temp.seek(0)
-    response.write(temp.read())
-    return response
+def tag_info(request, id):
+    tag = get_object_or_404(models.Tag, id=id)
+    return HttpResponse(tag.description)