X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/6bbfe08e5d5ea8c966355d3545505dcd76353426..d45957a6f6f199046a72595e016f7ebeeb459a37:/apps/catalogue/views.py
diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 0055f522d..de2c17b28 100644
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -72,19 +72,32 @@ def main_page(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 = {}
- 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)
+ 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] = []
- 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:
@@ -92,10 +105,24 @@ def book_list(request):
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))
+def audiobook_list(request):
+ return book_list(request, ~Q(mp3_file='') | ~Q(ogg_file=''),
+ template_name='catalogue/audiobook_list.html')
+
+
+def daisy_list(request):
+ return book_list(request, ~Q(daisy_file=''),
+ 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:])
@@ -159,7 +186,7 @@ def tagged_object_list(request, tags=''):
objects = fragments
else:
# get relevant books and their tags
- objects = models.Book.tagged.with_all(tags).order_by()
+ 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])
@@ -257,6 +284,8 @@ def book_stub_detail(request, slug):
def book_text(request, slug):
book = get_object_or_404(models.Book, slug=slug)
+ if not book.has_html_file():
+ raise Http404
book_themes = {}
for fragment in book.fragments.all():
for theme in fragment.tags.filter(category='theme'):
@@ -319,7 +348,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
@@ -352,6 +381,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.
@@ -444,13 +477,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():
@@ -523,19 +556,21 @@ 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()
archive = zipfile.ZipFile(temp, 'w')
+ already = set()
for book in collect_books(models.Book.tagged.with_all(shelf)):
if 'pdf' in formats and book.pdf_file:
filename = book.pdf_file.path
archive.write(filename, str('%s.pdf' % book.slug))
- if 'epub' in formats and book.epub_file:
- filename = book.epub_file.path
- archive.write(filename, str('%s.epub' % book.slug))
+ if book.root_ancestor not in already and 'epub' in formats and book.root_ancestor.epub_file:
+ 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))
@@ -548,6 +583,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')
@@ -566,12 +604,12 @@ 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:
formats['pdf'] = True
- if book.epub_file:
+ if book.root_ancestor.epub_file:
formats['epub'] = True
if book.odt_file:
formats['odt'] = True
@@ -581,6 +619,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))