X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/7ad61a2597aadd17dd548c2ce6f20aa9c303e621..db833ba4517084f61a64907c6d15606e7c881edd:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index 45dc7a029..c9d6ab227 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -1,4 +1,7 @@ # -*- coding: utf-8 -*- +import tempfile +import zipfile + from django.template import RequestContext from django.shortcuts import render_to_response, get_object_or_404 from django.http import HttpResponse, HttpResponseRedirect, Http404 @@ -27,7 +30,6 @@ class LazyEncoder(simplejson.JSONEncoder): return obj -@cache.cache_control(must_revalidate=True, max_age=3600) def main_page(request): if request.user.is_authenticated(): shelves = models.Tag.objects.filter(category='set', user=request.user) @@ -55,7 +57,6 @@ def book_list(request): context_instance=RequestContext(request)) -@cache.cache_control(must_revalidate=True, max_age=3600) def tagged_object_list(request, tags=''): # Prevent DoS attacks on our database if len(tags.split('/')) > 6: @@ -67,16 +68,19 @@ def tagged_object_list(request, tags=''): raise Http404 model = models.Book + shelf = [tag for tag in tags if tag.category == 'set'] shelf_is_set = (len(tags) == 1 and tags[0].category == 'set') theme_is_set = len([tag for tag in tags if tag.category == 'theme']) > 0 if theme_is_set: model = models.Fragment + user_is_owner = (len(shelf) and request.user.is_authenticated() and request.user == shelf[0].user) + extra_where = 'NOT catalogue_tag.category = "set"' related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]}) categories = split_tags(related_tags) - if not theme_is_set: + if not (theme_is_set or shelf_is_set): model=models.Book.objects.filter(parent=None) return newtagging_views.tagged_object_list( @@ -85,7 +89,7 @@ def tagged_object_list(request, tags=''): queryset_or_model=model, tags=tags, template_name='catalogue/tagged_object_list.html', - extra_context = {'categories': categories, 'shelf_is_set': shelf_is_set }, + extra_context = {'categories': categories, 'shelf_is_set': shelf_is_set, 'user_is_owner': user_is_owner }, ) @@ -116,62 +120,63 @@ def book_text(request, slug): # ========== # = Search = # ========== -def search(request): - query = request.GET.get('q', '') - tags = request.GET.get('tags', '') - if tags == '': - tags = [] - - try: - tag_list = models.Tag.get_tag_list(tags) - tag = models.Tag.objects.get(name=query) - except models.Tag.DoesNotExist: - try: - book = models.Book.objects.get(title=query) - return HttpResponseRedirect(book.get_absolute_url()) - except models.Book.DoesNotExist: - return HttpResponseRedirect(reverse('catalogue.views.main_page')) +def _tags_starting_with(prefix, user): + books = models.Book.objects.filter(title__icontains=prefix) + tags = models.Tag.objects.filter(name__icontains=prefix) + if user.is_authenticated(): + tags = tags.filter(~Q(category='set') | Q(user=user)) else: - tag_list.append(tag) - return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', - kwargs={'tags': '/'.join(tag.slug for tag in tag_list)} - )) + tags = tags.filter(~Q(category='set')) + return list(books) + list(tags) + -def tags_starting_with(request): +def search(request): + tags = request.GET.get('tags', '') + prefix = request.GET.get('q', '') + # Prefix must have at least 2 characters + if len(prefix) < 2: + return HttpResponse('') + try: - prefix = request.GET['q'] - if len(prefix) < 2: - raise KeyError - - books = models.Book.objects.filter(title__icontains=prefix) - tags = models.Tag.objects.filter(name__icontains=prefix) - if request.user.is_authenticated(): - tags = tags.filter(~Q(category='set') | Q(user=request.user)) + tag_list = models.Tag.get_tag_list(tags) + except: + tag_list = [] + + result = _tags_starting_with(prefix, request.user) + if len(result) > 0: + tag = result[0] + if isinstance(tag, models.Book): + return HttpResponseRedirect(tag.get_absolute_url()) else: - tags = tags.filter(~Q(category='set')) - - completions = [book.title for book in books] + [tag.name for tag in tags] + tag_list.append(tag) + + return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', + kwargs={'tags': '/'.join(tag.slug for tag in tag_list)} + )) - return HttpResponse('\n'.join(completions)) - except KeyError: +def tags_starting_with(request): + prefix = request.GET['q'] + # Prefix must have at least 2 characters + if len(prefix) < 2: return HttpResponse('') + + return HttpResponse('\n'.join(tag.name for tag in _tags_starting_with(prefix, request.user))) # ==================== # = Shelf management = # ==================== @login_required -@cache.cache_control(must_revalidate=True, max_age=3600, private=True) +@cache.never_cache def user_shelves(request): shelves = models.Tag.objects.filter(category='set', user=request.user) new_set_form = forms.NewSetForm() return render_to_response('catalogue/user_shelves.html', locals(), context_instance=RequestContext(request)) - -@cache.cache_control(must_revalidate=True, max_age=3600, private=True) +@cache.never_cache def book_sets(request, slug): book = get_object_or_404(models.Book, slug=slug) user_sets = models.Tag.objects.filter(category='set', user=request.user) @@ -183,8 +188,18 @@ def book_sets(request, slug): if request.method == 'POST': form = forms.ObjectSetsForm(book, request.user, request.POST) if form.is_valid(): - book.tags = ([models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']] + - list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))) + old_shelves = list(book.tags.filter(category='set')) + new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']] + + for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]: + shelf.book_count -= 1 + shelf.save() + + for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]: + shelf.book_count += 1 + shelf.save() + + book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user))) if request.is_ajax(): return HttpResponse('
PóÅki zostaÅy zapisane.
') else: @@ -197,6 +212,65 @@ def book_sets(request, slug): context_instance=RequestContext(request)) +@login_required +@require_POST +@cache.never_cache +def remove_from_shelf(request, shelf, book): + book = get_object_or_404(models.Book, slug=book) + shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user) + + models.Tag.objects.remove_tag(book, shelf) + + shelf.book_count -= 1 + shelf.save() + + return HttpResponse('Usunieto') + + +@cache.never_cache +def download_shelf(request, slug): + """" + Create a ZIP archive on disk and transmit it in chunks of 8KB, + without loading the whole file into memory. A similar approach can + be used for large dynamic PDF files. + """ + shelf = get_object_or_404(models.Tag, slug=slug, category='set') + + # Create a ZIP archive + temp = temp = tempfile.TemporaryFile() + archive = zipfile.ZipFile(temp, 'w') + + # Collect all books to include in ZIP archive + def collect_books(books): + result = [] + for book in books: + if len(book.children.all()) == 0: + result.append(book) + else: + result += collect_books(book.children.all()) + return result + + for book in collect_books(models.Book.tagged.with_all(shelf)): + if book.pdf_file: + filename = book.pdf_file.path + archive.write(filename, str('%s.pdf' % book.slug)) + if book.odt_file: + filename = book.odt_file.path + archive.write(filename, str('%s.odt' % book.slug)) + if book.txt_file: + filename = book.txt_file.path + archive.write(filename, str('%s.txt' % 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-Length'] = temp.tell() + + temp.seek(0) + response.write(temp.read()) + return response + + @login_required @require_POST @cache.never_cache @@ -210,8 +284,7 @@ def new_set(request): else: return HttpResponseRedirect('/') - return render_to_response('catalogue/book_sets.html', locals(), - context_instance=RequestContext(request)) + return HttpResponseRedirect('/') @login_required