bugfix for book infobox

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 29bf805..7f1de6d 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -4,12 +4,13 @@
 #
 import tempfile
 import zipfile
 #
 import tempfile
 import zipfile

+import tarfile

 import sys
 import pprint
 import traceback
 import re
 import itertools
 import sys
 import pprint
 import traceback
 import re
 import itertools

-from operator import itemgetter
+from datetime import datetime

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


@@ -36,6 +37,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 slughifi import slughifi

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


@@ -74,24 +76,32 @@ def main_page(request):
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

-def book_list(request):
+def book_list(request, filter=None, template_name='catalogue/book_list.html'):
+    """ generates a listing of all books, optionally filtered with a test function """
+

     form = forms.SearchForm()
 
     books_by_parent = {}
     form = forms.SearchForm()
 
     books_by_parent = {}

-    for book in models.Book.objects.all().order_by('parent_number'):
-        books_by_parent.setdefault(book.parent, []).append(book)
+    books = models.Book.objects.all().order_by('parent_number', 'title').only('title', 'parent', 'slug')
+    if filter:
+        books = books.filter(filter).distinct()
+        book_ids = set((book.pk for book in books))
+        for book in books:
+            parent = book.parent_id
+            if parent not in book_ids:
+                parent = None
+            books_by_parent.setdefault(parent, []).append(book)
+    else:
+        for book in books:
+            books_by_parent.setdefault(book.parent_id, []).append(book)

 
     orphans = []
     books_by_author = SortedDict()
     books_nav = SortedDict()
     for tag in models.Tag.objects.filter(category='author'):
         books_by_author[tag] = []
 
     orphans = []
     books_by_author = SortedDict()
     books_nav = SortedDict()
     for tag in models.Tag.objects.filter(category='author'):
         books_by_author[tag] = []

-        if books_nav.has_key(tag.sort_key[0]):
-            books_nav[tag.sort_key[0]].append(tag)
-        else:
-            books_nav[tag.sort_key[0]] = [tag]

 
 

-    for book in books_by_parent[None]:
+    for book in books_by_parent.get(None,()):

         authors = list(book.tags.filter(category='author'))
         if authors:
             for author in authors:
         authors = list(book.tags.filter(category='author'))
         if authors:
             for author in authors:


@@ -99,10 +109,24 @@ def book_list(request):
         else:
             orphans.append(book)
 
         else:
             orphans.append(book)
 

-    return render_to_response('catalogue/book_list.html', locals(),
+    for tag in books_by_author:
+        if books_by_author[tag]:
+            books_nav.setdefault(tag.sort_key[0], []).append(tag)
+
+    return render_to_response(template_name, locals(),

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

+def audiobook_list(request):
+    return book_list(request, Q(medias__type='mp3') | Q(medias__type='ogg'),
+                     template_name='catalogue/audiobook_list.html')
+
+
+def daisy_list(request):
+    return book_list(request, Q(medias__type='daisy'),
+                     template_name='catalogue/daisy_list.html')
+
+

 def differentiate_tags(request, tags, ambiguous_slugs):
     beginning = '/'.join(tag.url_chunk for tag in tags)
     unparsed = '/'.join(ambiguous_slugs[1:])
 def differentiate_tags(request, tags, ambiguous_slugs):
     beginning = '/'.join(tag.url_chunk for tag in tags)
     unparsed = '/'.join(ambiguous_slugs[1:])


@@ -234,7 +258,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')
+    book_children = book.children.all().order_by('parent_number', 'title')

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


@@ -310,21 +334,42 @@ def _word_starts_with(name, prefix):
     return Q(**kwargs)
 
 
     return Q(**kwargs)
 
 

+def _word_starts_with_regexp(prefix):
+    prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
+    return ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix
+
+

 def _sqlite_word_starts_with(name, prefix):
     """ version of _word_starts_with for SQLite
 
     SQLite in Django uses Python re module
     """
     kwargs = {}
 def _sqlite_word_starts_with(name, prefix):
     """ version of _word_starts_with for SQLite
 
     SQLite in Django uses Python re module
     """
     kwargs = {}

-    prefix = _no_diacritics_regexp(unicode_re_escape(prefix))
-    kwargs['%s__iregex' % name] = ur"(^|(?<=[^\wąćęłńóśźżĄĆĘŁŃÓŚŹŻ]))%s" % prefix
+    kwargs['%s__iregex' % name] = _word_starts_with_regexp(prefix)

     return Q(**kwargs)
 
 
     return Q(**kwargs)
 
 

-if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
+if hasattr(settings, 'DATABASES'):
+    if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3':
+        _word_starts_with = _sqlite_word_starts_with
+elif settings.DATABASE_ENGINE == 'sqlite3':

     _word_starts_with = _sqlite_word_starts_with
 
 
     _word_starts_with = _sqlite_word_starts_with
 
 

+class App():
+    def __init__(self, name, view):
+        self.name = name
+        self._view = view
+        self.lower = name.lower()
+        self.category = 'application'
+    def view(self):
+        return reverse(*self._view)
+
+_apps = (
+    App(u'Leśmianator', (u'lesmianator', )),
+    )
+
+

 def _tags_starting_with(prefix, user=None):
     prefix = prefix.lower()
     # PD counter
 def _tags_starting_with(prefix, user=None):
     prefix = prefix.lower()
     # PD counter


@@ -337,7 +382,9 @@ def _tags_starting_with(prefix, user=None):
         tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))
     else:
         tags = tags.filter(~Q(category='book') & ~Q(category='set'))
         tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))
     else:
         tags = tags.filter(~Q(category='book') & ~Q(category='set'))

-    return list(books) + list(tags) + list(book_stubs) + list(authors)
+
+    prefix_regexp = re.compile(_word_starts_with_regexp(prefix))
+    return list(books) + list(tags) + [app for app in _apps if prefix_regexp.search(app.lower)] + list(book_stubs) + list(authors)

 
 
 def _get_result_link(match, tag_list):
 
 
 def _get_result_link(match, tag_list):


@@ -345,6 +392,8 @@ def _get_result_link(match, tag_list):
         return reverse('catalogue.views.tagged_object_list',
             kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])}
         )
         return reverse('catalogue.views.tagged_object_list',
             kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])}
         )

+    elif isinstance(match, App):
+        return match.view()

     else:
         return match.get_absolute_url()
 
     else:
         return match.get_absolute_url()
 


@@ -442,13 +491,14 @@ def json_tags_starting_with(request, callback=None):
     if len(prefix) < 2:
         return HttpResponse('')
     tags_list = []
     if len(prefix) < 2:
         return HttpResponse('')
     tags_list = []

-    result = ""   

     for tag in _tags_starting_with(prefix, request.user):
         if not tag.name in tags_list:
     for tag in _tags_starting_with(prefix, request.user):
         if not tag.name in tags_list:

-            result += "\n" + tag.name

             tags_list.append(tag.name)
             tags_list.append(tag.name)

-    dict_result = {"matches": tags_list}
-    return JSONResponse(dict_result, callback)
+    if request.GET.get('mozhint', ''):
+        result = [prefix, tags_list]
+    else:
+        result = {"matches": tags_list}
+    return JSONResponse(result, callback)

 
 # ====================
 # = Shelf management =
 
 # ====================
 # = Shelf management =


@@ -486,7 +536,7 @@ def book_sets(request, slug):
 
             book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
             if request.is_ajax():
 
             book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))
             if request.is_ajax():

-                return HttpResponse(_('<p>Shelves were sucessfully saved.</p>'))
+                return JSONResponse('{"msg":"'+_("<p>Shelves were sucessfully saved.</p>")+'", "after":"close"}')

             else:
                 return HttpResponseRedirect('/')
     else:
             else:
                 return HttpResponseRedirect('/')
     else:


@@ -542,7 +592,7 @@ def download_shelf(request, slug):
     if form.is_valid():
         formats = form.cleaned_data['formats']
     if len(formats) == 0:
     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()
 
     # Create a ZIP archive
     temp = tempfile.TemporaryFile()


@@ -557,25 +607,17 @@ def download_shelf(request, slug):
             filename = book.root_ancestor.epub_file.path
             archive.write(filename, str('%s.epub' % book.root_ancestor.slug))
             already.add(book.root_ancestor)
             filename = book.root_ancestor.epub_file.path
             archive.write(filename, str('%s.epub' % book.root_ancestor.slug))
             already.add(book.root_ancestor)

-        if 'odt' in formats and book.odt_file:
-            filename = book.odt_file.path
-            archive.write(filename, str('%s.odt' % book.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' % 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 '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.mp3_file:
-            filename = book.mp3_file.path
-            archive.write(filename, str('%s.mp3' % book.slug))
-        if 'ogg' in formats and book.ogg_file:
-            filename = book.ogg_file.path
-            archive.write(filename, str('%s.ogg' % book.slug))
-        if 'daisy' in formats and book.daisy_file:
-            filename = book.daisy_file.path
-            archive.write(filename, str('%s.daisy.zip' % book.slug))

     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')

-    response['Content-Disposition'] = 'attachment; filename=%s.zip' % shelf.sort_key
+    response['Content-Disposition'] = 'attachment; filename=%s.zip' % slughifi(shelf.name)

     response['Content-Length'] = temp.tell()
 
     temp.seek(0)
     response['Content-Length'] = temp.tell()
 
     temp.seek(0)


@@ -590,23 +632,18 @@ def shelf_book_formats(request, shelf):
     """
     shelf = get_object_or_404(models.Tag, slug=shelf, category='set')
 
     """
     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
 
     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.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))
 
 
     return HttpResponse(LazyEncoder().encode(formats))
 


@@ -620,7 +657,7 @@ def new_set(request):
         new_set = new_set_form.save(request.user)
 
         if request.is_ajax():
         new_set = new_set_form.save(request.user)
 
         if request.is_ajax():

-            return HttpResponse(_('<p>Shelf <strong>%s</strong> was successfully created</p>') % new_set)
+            return JSONResponse('{"id":"%d", "name":"%s", "msg":"<p>Shelf <strong>%s</strong> was successfully created</p>"}' % (new_set.id, new_set.name, new_set))

         else:
             return HttpResponseRedirect('/')
 
         else:
             return HttpResponseRedirect('/')
 


@@ -705,5 +742,26 @@ def clock(request):
     """ Provides server time for jquery.countdown,
     in a format suitable for Date.parse()
     """
     """ Provides server time for jquery.countdown,
     in a format suitable for Date.parse()
     """

-    from datetime import datetime

     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()
+
+    response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed')
+    response['Content-Disposition'] = 'attachment; filename=xmls.zip'
+    response['Content-Length'] = temp.tell()
+
+    temp.seek(0)
+    response.write(temp.read())
+    return response