X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8037505309870a6372cde196ce6a115f728612c2..c028a70a6130acfe7e86f37f1a9f2e6b36a26194:/apps/catalogue/views.py?ds=inline diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index fd8a6330f..235a17dd5 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -2,12 +2,6 @@ # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later. # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information. # -import tempfile -import zipfile -import tarfile -import sys -import pprint -import traceback import re import itertools from datetime import datetime @@ -34,13 +28,12 @@ from django.views.generic.list_detail import object_list from catalogue import models from catalogue import forms -from catalogue.utils import split_tags -from newtagging import views as newtagging_views +from catalogue.utils import split_tags, AttachmentHttpResponse, async_build_pdf from pdcounter import models as pdcounter_models from pdcounter import views as pdcounter_views from suggest.forms import PublishingSuggestForm -from slughifi import slughifi +from os import path staff_required = user_passes_test(lambda user: user.is_staff) @@ -83,34 +76,8 @@ def book_list(request, filter=None, template_name='catalogue/book_list.html'): form = forms.SearchForm() - books_by_parent = {} - books = models.Book.objects.all().order_by('parent_number', 'sort_key').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_by_author, orphans, books_by_parent = models.Book.book_list(filter) books_nav = SortedDict() - for tag in models.Tag.objects.filter(category='author'): - books_by_author[tag] = [] - - for book in books_by_parent.get(None,()): - authors = list(book.tags.filter(category='author')) - if authors: - for author in authors: - books_by_author[author].append(book) - else: - orphans.append(book) - for tag in books_by_author: if books_by_author[tag]: books_nav.setdefault(tag.sort_key[0], []).append(tag) @@ -129,27 +96,6 @@ def daisy_list(request): template_name='catalogue/daisy_list.html') -def counters(request): - form = forms.SearchForm() - - books = models.Book.objects.count() - books_nonempty = models.Book.objects.exclude(html_file='').count() - books_empty = models.Book.objects.filter(html_file='').count() - books_root = models.Book.objects.filter(parent=None).count() - - media = models.BookMedia.objects.count() - media_types = models.BookMedia.objects.values('type').\ - annotate(count=Count('type')).\ - order_by('type') - for mt in media_types: - mt['size'] = sum(b.file.size for b in models.BookMedia.objects.filter(type=mt['type'])) - mt['deprecated'] = models.BookMedia.objects.filter( - type=mt['type'], source_sha1=None).count() if mt['type'] in ('mp3', 'ogg') else '-' - - return render_to_response('catalogue/counters.html', - locals(), context_instance=RequestContext(request)) - - def differentiate_tags(request, tags, ambiguous_slugs): beginning = '/'.join(tag.url_chunk for tag in tags) unparsed = '/'.join(ambiguous_slugs[1:]) @@ -258,9 +204,13 @@ def tagged_object_list(request, tags=''): ) -def book_fragments(request, book_slug, theme_slug): - book = get_object_or_404(models.Book, slug=book_slug) - book_tag = get_object_or_404(models.Tag, slug='l-' + book_slug, category='book') +def book_fragments(request, book, theme_slug): + kwargs = models.Book.split_urlid(book) + if kwargs is None: + raise Http404 + book = get_object_or_404(models.Book, **kwargs) + + book_tag = book.book_tag() theme = get_object_or_404(models.Tag, slug=theme_slug, category='theme') fragments = models.Fragment.tagged.with_all([book_tag, theme]) @@ -269,11 +219,14 @@ def book_fragments(request, book_slug, theme_slug): context_instance=RequestContext(request)) -def book_detail(request, slug): +def book_detail(request, book): + kwargs = models.Book.split_urlid(book) + if kwargs is None: + raise Http404 try: - book = models.Book.objects.get(slug=slug) + book = models.Book.objects.get(**kwargs) except models.Book.DoesNotExist: - return pdcounter_views.book_stub_detail(request, slug) + return pdcounter_views.book_stub_detail(request, kwargs['slug']) book_tag = book.book_tag() tags = list(book.tags.filter(~Q(category='set'))) @@ -293,6 +246,7 @@ def book_detail(request, slug): tag.count = theme_counter[tag.pk] extra_info = book.get_extra_info_value() + hide_about = extra_info.get('about', '').startswith('http://wiki.wolnepodreczniki.pl') projects = set() for m in book.media.filter(type='mp3'): @@ -307,12 +261,17 @@ def book_detail(request, slug): projects = sorted(projects) form = forms.SearchForm() + custom_pdf_form = forms.CustomPDFForm() return render_to_response('catalogue/book_detail.html', locals(), context_instance=RequestContext(request)) -def book_text(request, slug): - book = get_object_or_404(models.Book, slug=slug) +def book_text(request, book): + kwargs = models.Book.split_fileid(book) + if kwargs is None: + raise Http404 + book = get_object_or_404(models.Book, **kwargs) + if not book.has_html_file(): raise Http404 book_themes = {} @@ -444,7 +403,7 @@ def books_starting_with(prefix): def find_best_matches(query, user=None): - """ Finds a Book, Tag, BookStub or Author best matching a query. + """ Finds a models.Book, Tag, models.BookStub or Author best matching a query. Returns a with: - zero elements when nothing is found, @@ -546,11 +505,15 @@ def user_shelves(request): context_instance=RequestContext(request)) @cache.never_cache -def book_sets(request, slug): +def book_sets(request, book): 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) + kwargs = models.Book.split_urlid(book) + if kwargs is None: + raise Http404 + book = get_object_or_404(models.Book, **kwargs) + user_sets = models.Tag.objects.filter(category='set', user=request.user) book_sets = book.tags.filter(category='set', user=request.user) @@ -585,7 +548,11 @@ def book_sets(request, slug): @require_POST @cache.never_cache def remove_from_shelf(request, shelf, book): - book = get_object_or_404(models.Book, slug=book) + kwargs = models.Book.split_urlid(book) + if kwargs is None: + raise Http404 + book = get_object_or_404(models.Book, **kwargs) + shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user) if shelf in book.tags: @@ -619,6 +586,10 @@ def download_shelf(request, slug): without loading the whole file into memory. A similar approach can be used for large dynamic PDF files. """ + from slughifi import slughifi + import tempfile + import zipfile + shelf = get_object_or_404(models.Tag, slug=slug, category='set') formats = [] @@ -626,7 +597,7 @@ def download_shelf(request, slug): if form.is_valid(): formats = form.cleaned_data['formats'] if len(formats) == 0: - formats = ['pdf', 'epub', 'odt', 'txt'] + formats = ['pdf', 'epub', 'mobi', 'odt', 'txt'] # Create a ZIP archive temp = tempfile.TemporaryFile() @@ -634,12 +605,16 @@ def download_shelf(request, slug): already = set() for book in collect_books(models.Book.tagged.with_all(shelf)): + fileid = book.fileid() if 'pdf' in formats and book.pdf_file: filename = book.pdf_file.path - archive.write(filename, str('%s.pdf' % book.slug)) + archive.write(filename, str('%s.pdf' % fileid)) + if 'mobi' in formats and book.mobi_file: + filename = book.mobi_file.path + archive.write(filename, str('%s.mobi' % fileid)) 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)) + archive.write(filename, str('%s.epub' % book.root_ancestor.fileid())) already.add(book.root_ancestor) if 'odt' in formats and book.has_media("odt"): for file in book.get_media("odt"): @@ -647,7 +622,7 @@ def download_shelf(request, slug): 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)) + archive.write(filename, str('%s.txt' % fileid)) archive.close() response = HttpResponse(content_type='application/zip', mimetype='application/x-zip-compressed') @@ -666,13 +641,15 @@ 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} + formats = {'pdf': False, 'epub': False, 'mobi': 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.mobi_file: + formats['mobi'] = True if book.txt_file: formats['txt'] = True for format in ('odt',): @@ -762,6 +739,9 @@ def import_book(request): try: book_import_form.save() except: + import sys + import pprint + import traceback info = sys.exc_info() exception = pprint.pformat(info[1]) tb = '\n'.join(traceback.format_tb(info[2])) @@ -779,29 +759,6 @@ def clock(request): 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 - - - # info views for API def book_info(request, id, lang='pl'): @@ -811,6 +768,43 @@ def book_info(request, id, lang='pl'): return render_to_response('catalogue/book_info.html', locals(), context_instance=RequestContext(request)) + def tag_info(request, id): tag = get_object_or_404(models.Tag, id=id) return HttpResponse(tag.description) + + +def download_zip(request, format, book=None): + kwargs = models.Book.split_fileid(book) + + url = None + if format in ('pdf', 'epub', 'mobi'): + url = models.Book.zip_format(format) + elif format == 'audiobook' and kwargs is not None: + book = get_object_or_404(models.Book, **kwargs) + url = book.zip_audiobooks() + else: + raise Http404('No format specified for zip package') + return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?=')) + + +def download_custom_pdf(request, book_fileid): + kwargs = models.Book.split_fileid(book_fileid) + if kwargs is None: + raise Http404 + book = get_object_or_404(models.Book, **kwargs) + + if request.method == 'GET': + form = forms.CustomPDFForm(request.GET) + if form.is_valid(): + cust = form.customizations + pdf_file = models.get_customized_pdf_path(book, cust) + + if not path.exists(pdf_file): + result = async_build_pdf.delay(book.id, cust, pdf_file) + result.wait() + return AttachmentHttpResponse(file_name=("%s.pdf" % book_fileid), file_path=pdf_file, mimetype="application/pdf") + else: + raise Http404(_('Incorrect customization options for PDF')) + else: + raise Http404(_('Bad method'))