X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/1e982a1f6de39a3d52178c5035cdd21b524e1928..f2c1566914d2ee615546134b9e080fc32c1a1094:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 010d3bfcd..2a11f4bb5 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -81,8 +81,13 @@ def book_list(request): 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]: authors = list(book.tags.filter(category='author')) @@ -321,7 +326,7 @@ def _sqlite_word_starts_with(name, prefix): return Q(**kwargs) -if settings.DATABASE_ENGINE == 'sqlite3': +if settings.DATABASES['default']['ENGINE'] == 'django.db.backends.sqlite3': _word_starts_with = _sqlite_word_starts_with @@ -354,6 +359,10 @@ def _get_result_type(match): return type +def books_starting_with(prefix): + prefix = prefix.lower() + return models.Book.objects.filter(_word_starts_with('title', prefix)) + def find_best_matches(query, user=None): """ Finds a Book, Tag or Bookstub best matching a query. @@ -446,13 +455,13 @@ def user_shelves(request): @cache.never_cache def book_sets(request, slug): + if not request.user.is_authenticated(): + return HttpResponse(_('

To maintain your shelves you need to be logged in.

')) + book = get_object_or_404(models.Book, slug=slug) user_sets = models.Tag.objects.filter(category='set', user=request.user) book_sets = book.tags.filter(category='set', user=request.user) - if not request.user.is_authenticated(): - return HttpResponse(_('

To maintain your shelves you need to be logged in.

')) - if request.method == 'POST': form = forms.ObjectSetsForm(book, request.user, request.POST) if form.is_valid(): @@ -525,7 +534,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'] + formats = ['pdf', 'epub', 'odt', 'txt', 'mp3', 'ogg', 'daisy'] # Create a ZIP archive temp = tempfile.TemporaryFile() @@ -552,6 +561,9 @@ def download_shelf(request, 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') @@ -570,7 +582,7 @@ 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} + formats = {'pdf': False, 'epub': False, 'odt': False, 'txt': False, 'mp3': False, 'ogg': False, 'daisy': False} for book in collect_books(models.Book.tagged.with_all(shelf)): if book.pdf_file: @@ -585,6 +597,8 @@ def shelf_book_formats(request, shelf): formats['mp3'] = True if book.ogg_file: formats['ogg'] = True + if book.daisy_file: + formats['daisy'] = True return HttpResponse(LazyEncoder().encode(formats))