#1106: disable downlowading audiobooks

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 26821a3..a6f394f 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -10,7 +10,6 @@ import pprint
 import traceback
 import re
 import itertools
-from operator import itemgetter
 from datetime import datetime
 
 from django.conf import settings
@@ -31,7 +30,7 @@ from django.utils.http import urlquote_plus
 from django.views.decorators import cache
 from django.utils.translation import ugettext as _
 from django.views.generic.list_detail import object_list
-from django.template.defaultfilters import slugify
+
 from catalogue import models
 from catalogue import forms
 from catalogue.utils import split_tags
@@ -428,11 +427,21 @@ def find_best_matches(query, user=None):
         raise ValueError("query must have at least two characters")
 
     result = tuple(_tags_starting_with(query, user))
+    # remove pdcounter stuff
+    book_titles = set(match.pretty_title().lower() for match in result
+                      if isinstance(match, models.Book))
+    authors = set(match.name.lower() for match in result
+                  if isinstance(match, models.Tag) and match.category=='author')
+    result = tuple(res for res in result if not (
+                 (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles)
+                 or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors)
+             ))
+
     exact_matches = tuple(res for res in result if res.name.lower() == query)
     if exact_matches:
         return exact_matches
     else:
-        return result[:1]
+        return tuple(result)[:1]
 
 
 def search(request):
@@ -582,7 +591,7 @@ def download_shelf(request, slug):
     if form.is_valid():
         formats = form.cleaned_data['formats']
     if len(formats) == 0:
-        formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg', 'daisy']
+        formats = ['pdf', 'epub', 'odt', 'txt']
 
     # Create a ZIP archive
     temp = tempfile.TemporaryFile()
@@ -600,22 +609,10 @@ def download_shelf(request, slug):
         if 'odt' in formats and book.has_media("odt"):
             for file in book.get_media("odt"):
                 filename = file.file.path
-                archive.write(filename, str('%s.odt' % slugify(file.name)))
+                archive.write(filename, str('%s.odt' % slughifi(file.name)))
         if 'txt' in formats and book.txt_file:
             filename = book.txt_file.path
             archive.write(filename, str('%s.txt' % book.slug))
-        if 'mp3' in formats and book.has_media("mp3"):
-            for file in book.get_media("mp3"):
-                filename = file.file.path
-                archive.write(filename, str('%s.mp3' % slugify(file.name)))
-        if 'ogg' in formats and book.has_media("ogg"):
-            for file in book.get_media("ogg"):
-                filename = file.file.path
-                archive.write(filename, str('%s.ogg' % slugify(file.name)))
-        if 'daisy' in formats and book.has_media("daisy"):
-            for file in book.get_media("daisy"):
-                filename = file.file.path
-                archive.write(filename, str('%s.daisy' % slugify(file.name)))                                
     archive.close()
 
     response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
@@ -634,23 +631,18 @@ def shelf_book_formats(request, shelf):
     """
     shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
 
-    formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False, 'daisy': False}
+    formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False}
 
     for book in collect_books(models.Book.tagged.with_all(shelf)):
         if book.pdf_file:
             formats['pdf'] = True
         if book.root_ancestor.epub_file:
             formats['epub'] = True
-        if book.odt_file:
-            formats['odt'] = True
         if book.txt_file:
             formats['txt'] = True
-        if book.mp3_file:
-            formats['mp3'] = True
-        if book.ogg_file:
-            formats['ogg'] = True
-        if book.daisy_file:
-            formats['daisy'] = True
+        for format in ('odt',):
+            if book.has_media(format):
+                formats[format] = True
 
     return HttpResponse(LazyEncoder().encode(formats))
 
@@ -756,6 +748,7 @@ def clock(request):
 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')
@@ -771,25 +764,3 @@ def xmls(request):
     temp.seek(0)
     response.write(temp.read())
     return response
-
-
-@cache.never_cache
-def epubs(request):
-    """"
-    Create a tar archive with all EPUB files, segregated to directories.
-    """
-
-    temp = tempfile.TemporaryFile()
-    archive = tarfile.TarFile(fileobj=temp, mode='w')
-
-    for book in models.Book.objects.exclude(epub_file=''):
-        archive.add(book.epub_file.path, (u'%s/%s.epub' % (book.get_extra_info_value()['author'], book.slug)).encode('utf-8'))
-    archive.close()
-
-    response = HttpResponse(content_type='application/tar', mimetype='application/x-tar')
-    response['Content-Disposition'] = 'attachment; filename=epubs.tar'
-    response['Content-Length'] = temp.tell()
-
-    temp.seek(0)
-    response.write(temp.read())
-    return response