X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/0739e3055a53ad77c1c7de4352750f60453e20c1..764fcc72600a23d5093511228dee596b55c45c72:/apps/catalogue/views.py diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 7bb82fd4a..bf0c42f70 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -2,21 +2,16 @@ # 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 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.shortcuts import render_to_response, get_object_or_404 -from django.http import HttpResponse, HttpResponseRedirect, Http404 +from django.http import HttpResponse, HttpResponseRedirect, Http404, HttpResponsePermanentRedirect from django.core.urlresolvers import reverse -from django.db.models import Q +from django.db.models import Count, Sum, Q from django.contrib.auth.decorators import login_required, user_passes_test from django.utils.datastructures import SortedDict from django.views.decorators.http import require_POST @@ -27,15 +22,16 @@ from django.utils.functional import Promise from django.utils.encoding import force_unicode from django.utils.http import urlquote_plus from django.views.decorators import cache +from django.utils import translation from django.utils.translation import ugettext as _ 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 pdcounter import models as pdcounter_models from pdcounter import views as pdcounter_views +from suggest.forms import PublishingSuggestForm staff_required = user_passes_test(lambda user: user.is_staff) @@ -74,35 +70,43 @@ def main_page(request): context_instance=RequestContext(request)) -def book_list(request): - form = forms.SearchForm() +def book_list(request, filter=None, template_name='catalogue/book_list.html', + context=None): + """ generates a listing of all books, optionally filtered with a test function """ - books_by_parent = {} - for book in models.Book.objects.all().order_by('parent_number'): - books_by_parent.setdefault(book.parent, []).append(book) + form = forms.SearchForm() - 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] = [] - 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')) - 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) - return render_to_response('catalogue/book_list.html', locals(), + return render_to_response(template_name, locals(), context_instance=RequestContext(request)) +def audiobook_list(request): + return book_list(request, Q(media__type='mp3') | Q(media__type='ogg'), + template_name='catalogue/audiobook_list.html') + + +def daisy_list(request): + return book_list(request, Q(media__type='daisy'), + template_name='catalogue/daisy_list.html') + + +def collection(request, slug): + coll = get_object_or_404(models.Collection, slug=slug) + slugs = coll.book_slugs.split() + # allow URIs + slugs = [slug.rstrip('/').rsplit('/', 1)[-1] if '/' in slug else slug + for slug in slugs] + return book_list(request, Q(slug__in=slugs), + template_name='catalogue/collection.html', + context={'collection': coll}) + + def differentiate_tags(request, tags, ambiguous_slugs): beginning = '/'.join(tag.url_chunk for tag in tags) unparsed = '/'.join(ambiguous_slugs[1:]) @@ -128,6 +132,8 @@ def tagged_object_list(request, tags=''): raise Http404 except models.Tag.MultipleObjectsReturned, e: return differentiate_tags(request, e.tags, e.ambiguous_slugs) + except models.Tag.UrlDeprecationWarning, e: + return HttpResponsePermanentRedirect(reverse('tagged_object_list', args=['/'.join(tag.url_chunk for tag in e.tags)])) try: if len(tags) > settings.MAX_TAG_LIST: @@ -169,14 +175,10 @@ def tagged_object_list(request, tags=''): objects = fragments else: - # get relevant books and their tags - 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]) - descendants_keys = [book.pk for book in models.Book.tagged.with_any(l_tags)] - if descendants_keys: - objects = objects.exclude(pk__in=descendants_keys) + if shelf_is_set: + objects = models.Book.tagged.with_all(tags) + else: + objects = models.Book.tagged_top_level(tags) # get related tags from `tag_counter` and `theme_counter` related_counts = {} @@ -208,7 +210,6 @@ def tagged_object_list(request, tags=''): 'only_author': only_author, 'only_my_shelf': only_my_shelf, 'formats_form': forms.DownloadFormatsForm(), - 'tags': tags, } ) @@ -234,7 +235,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', 'sort_key') _book = book parents = [] @@ -249,6 +250,19 @@ 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'): + # ogg files are always from the same project + meta = m.get_extra_info_value() + project = meta.get('project') + if not project: + # temporary fallback + project = u'CzytamySÅuchajÄ c' + + projects.add((project, meta.get('funded_by', ''))) + projects = sorted(projects) form = forms.SearchForm() return render_to_response('catalogue/book_detail.html', locals(), @@ -310,21 +324,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() # PD counter @@ -337,7 +372,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')) - 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): @@ -345,6 +382,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])} ) + elif isinstance(match, App): + return match.view() else: return match.get_absolute_url() @@ -383,7 +422,7 @@ def find_best_matches(query, user=None): if isinstance(match, models.Book)) authors = set(match.name.lower() for match in result if isinstance(match, models.Tag) and match.category=='author') - result = (res for res in result if not ( + result = tuple(res for res in result if not ( (isinstance(res, pdcounter_models.BookStub) and res.pretty_title().lower() in book_titles) or (isinstance(res, pdcounter_models.Author) and res.name.lower() in authors) )) @@ -417,7 +456,9 @@ def search(request): {'tags':tag_list, 'prefix':prefix, 'results':((x, _get_result_link(x, tag_list), _get_result_type(x)) for x in result)}, context_instance=RequestContext(request)) else: - return render_to_response('catalogue/search_no_hits.html', {'tags':tag_list, 'prefix':prefix}, + form = PublishingSuggestForm(initial={"books": prefix + ", "}) + return render_to_response('catalogue/search_no_hits.html', + {'tags':tag_list, 'prefix':prefix, "pubsuggest_form": form}, context_instance=RequestContext(request)) @@ -442,13 +483,14 @@ def json_tags_starting_with(request, callback=None): 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: - result += "\n" + 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 = @@ -486,7 +528,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(): - return HttpResponse(_('
Shelves were sucessfully saved.
')) + return JSONResponse('{"msg":"'+_("Shelves were sucessfully saved.
")+'", "after":"close"}') else: return HttpResponseRedirect('/') else: @@ -535,6 +577,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 = [] @@ -542,7 +588,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', 'daisy'] + formats = ['pdf', 'epub', 'mobi', 'odt', 'txt'] # Create a ZIP archive temp = tempfile.TemporaryFile() @@ -553,29 +599,24 @@ def download_shelf(request, slug): if 'pdf' in formats and book.pdf_file: filename = book.pdf_file.path archive.write(filename, str('%s.pdf' % book.slug)) + if 'mobi' in formats and book.mobi_file: + filename = book.mobi_file.path + archive.write(filename, str('%s.mobi' % 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)) + 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 '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') - 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) @@ -590,23 +631,20 @@ 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, 'daisy': 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.odt_file: - formats['odt'] = True + if book.mobi_file: + formats['mobi'] = 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)) @@ -620,7 +658,7 @@ def new_set(request): new_set = new_set_form.save(request.user) if request.is_ajax(): - return HttpResponse(_('Shelf %s was successfully created
') % new_set) + return JSONResponse('{"id":"%d", "name":"%s", "msg":"Shelf %s was successfully created
"}' % (new_set.id, new_set.name, new_set)) else: return HttpResponseRedirect('/') @@ -691,6 +729,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])) @@ -705,5 +746,31 @@ def clock(request): """ 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')) + + +# info views for API + +def book_info(request, id, lang='pl'): + book = get_object_or_404(models.Book, id=id) + # set language by hand + translation.activate(lang) + 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, slug): + url = None + if format in ('pdf', 'epub', 'mobi'): + url = models.Book.zip_format(format) + elif format == 'audiobook' and slug is not None: + book = models.Book.objects.get(slug=slug) + url = book.zip_audiobooks() + else: + raise Http404('No format specified for zip package') + return HttpResponseRedirect(urlquote_plus(settings.MEDIA_URL + url, safe='/?='))