X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/cd16ef42a2d7497b179c0b14e360398dcb604a5b..088b37be4aa9fe5156c101c0e65b0d229bcec849:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index de522e2c9..fbd4fb610 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -31,7 +31,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 @@ -83,7 +83,7 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'): books_by_parent = {} books = models.Book.objects.all().order_by('parent_number', 'title').only('title', 'parent', 'slug') if filter: - books = books.filter(filter) + books = books.filter(filter).distinct() book_ids = set((book.pk for book in books)) for book in books: parent = book.parent_id @@ -117,12 +117,12 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'): def audiobook_list(request): - return book_list(request, ~Q(mp3_file='') | ~Q(ogg_file=''), + 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(daisy_file=''), + return book_list(request, Q(medias__type='daisy'), template_name='catalogue/daisy_list.html') @@ -255,7 +255,7 @@ def book_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') + book_children = book.children.all().order_by('parent_number', 'title') _book = book parents = [] @@ -340,21 +340,42 @@ def _word_starts_with(name, prefix): 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 = {} - 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) -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 +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() book_stubs = models.BookStub.objects.filter(_word_starts_with('title', prefix)) @@ -365,12 +386,16 @@ 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')) - return list(books) + list(tags) + list(book_stubs) + + prefix_regexp = re.compile(_word_starts_with_regexp(prefix)) + return list(books) + list(tags) + list(book_stubs) + [app for app in _apps if prefix_regexp.search(app.lower)] def _get_result_link(match, tag_list): if isinstance(match, models.Book) or isinstance(match, models.BookStub): return match.get_absolute_url() + elif isinstance(match, App): + return match.view() else: return reverse('catalogue.views.tagged_object_list', kwargs={'tags': '/'.join(tag.url_chunk for tag in tag_list + [match])} @@ -574,21 +599,25 @@ 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) - 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' % slugify(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.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)) + 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')