X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d7faec10cb85ad286673eec266ccc397142bc20c..92407309a3a6c4cd125086728910effddd92ab20:/apps/catalogue/views.py?ds=sidebyside diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py index f8ff5996..b30297cd 100644 --- a/apps/catalogue/views.py +++ b/apps/catalogue/views.py @@ -1,3 +1,4 @@ +from collections import defaultdict from datetime import datetime, date, timedelta import logging import os @@ -5,6 +6,7 @@ from StringIO import StringIO from urllib import unquote from urlparse import urlsplit, urlunsplit +from django.conf import settings from django.contrib import auth from django.contrib.auth.models import User from django.contrib.auth.decorators import login_required, permission_required @@ -13,20 +15,19 @@ from django.db.models import Count, Q from django.db import transaction from django import http from django.http import Http404, HttpResponse, HttpResponseForbidden -from django.shortcuts import get_object_or_404, render, render_to_response +from django.shortcuts import get_object_or_404, render from django.utils.encoding import iri_to_uri from django.utils.http import urlquote_plus from django.utils.translation import ugettext_lazy as _ from django.views.decorators.http import require_POST -from django.views.generic.simple import direct_to_template -from django.template import RequestContext from apiclient import NotAuthorizedError from catalogue import forms from catalogue import helpers from catalogue.helpers import active_tab -from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord -from catalogue.tasks import publishable_error +from catalogue.models import (Book, Chunk, Image, BookPublishRecord, + ChunkPublishRecord, ImagePublishRecord, Project) +from fileupload.views import UploadView # # Quick hack around caching problems, TODO: use ETags @@ -42,6 +43,12 @@ def document_list(request): return render(request, 'catalogue/document_list.html') +@active_tab('images') +@never_cache +def image_list(request, user=None): + return render(request, 'catalogue/image_list.html') + + @never_cache def user(request, username): user = get_object_or_404(User, username=username) @@ -52,17 +59,19 @@ def user(request, username): @active_tab('my') @never_cache def my(request): + last_books = sorted(request.session.get("wiki_last_books", {}).items(), + key=lambda x: x[1]['time'], reverse=True) + for k, v in last_books: + v['time'] = datetime.fromtimestamp(v['time']) return render(request, 'catalogue/my_page.html', { - 'last_books': sorted(request.session.get("wiki_last_books", {}).items(), - key=lambda x: x[1]['time'], reverse=True), - + 'last_books': last_books, "logout_to": '/', }) @active_tab('users') def users(request): - return direct_to_template(request, 'catalogue/user_list.html', extra_context={ + return render(request, 'catalogue/user_list.html', { 'users': User.objects.all().annotate(count=Count('chunk')).order_by( '-count', 'last_name', 'first_name'), }) @@ -122,7 +131,7 @@ def create_missing(request, slug=None): "gallery": slug, }) - return direct_to_template(request, "catalogue/document_create_missing.html", extra_context={ + return render(request, "catalogue/document_create_missing.html", { "slug": slug, "form": form, @@ -136,7 +145,7 @@ def upload(request): if request.method == "POST": form = forms.DocumentsUploadForm(request.POST, request.FILES) if form.is_valid(): - import slughifi + from slugify import slugify if request.user.is_authenticated(): creator = request.user @@ -153,7 +162,7 @@ def upload(request): if filename[-1] == '/': continue title = os.path.basename(filename)[:-4] - slug = slughifi(title) + slug = slugify(title) if not (slug and filename.endswith('.xml')): skipped_list.append(filename) elif slug in slugs: @@ -177,7 +186,7 @@ def upload(request): title=title, ) - return direct_to_template(request, "catalogue/document_upload.html", extra_context={ + return render(request, "catalogue/document_upload.html", { "form": form, "ok_list": ok_list, "skipped_list": skipped_list, @@ -188,7 +197,7 @@ def upload(request): else: form = forms.DocumentsUploadForm() - return direct_to_template(request, "catalogue/document_upload.html", extra_context={ + return render(request, "catalogue/document_upload.html", { "form": form, "logout_to": '/', @@ -202,7 +211,7 @@ def book_xml(request, slug): return HttpResponseForbidden("Not authorized.") xml = book.materialize() - response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml') + response = http.HttpResponse(xml, content_type='application/xml') response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug return response @@ -215,7 +224,7 @@ def book_txt(request, slug): doc = book.wldocument() text = doc.as_text().get_string() - response = http.HttpResponse(text, content_type='text/plain', mimetype='text/plain') + response = http.HttpResponse(text, content_type='text/plain') response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug return response @@ -227,10 +236,10 @@ def book_html(request, slug): return HttpResponseForbidden("Not authorized.") doc = book.wldocument(parse_dublincore=False) - html = doc.as_html() + html = doc.as_html(options={'gallery': "'%s'" % book.gallery_url()}) html = html.get_string() if html is not None else '' - # response = http.HttpResponse(html, content_type='text/html', mimetype='text/html') + # response = http.HttpResponse(html, content_type='text/html') # return response # book_themes = {} # for fragment in book.fragments.all().iterator(): @@ -239,8 +248,7 @@ def book_html(request, slug): # book_themes = book_themes.items() # book_themes.sort(key=lambda s: s[0].sort_key) - return render_to_response('catalogue/book_text.html', locals(), - context_instance=RequestContext(request)) + return render(request, 'catalogue/book_text.html', locals()) @never_cache @@ -252,7 +260,7 @@ def book_pdf(request, slug): # TODO: move to celery doc = book.wldocument() # TODO: error handling - pdf_file = doc.as_pdf() + pdf_file = doc.as_pdf(cover=True, ilustr_path=book.gallery_path()) from catalogue.ebook_utils import serve_file return serve_file(pdf_file.get_filename(), book.slug + '.pdf', 'application/pdf') @@ -267,13 +275,29 @@ def book_epub(request, slug): # TODO: move to celery doc = book.wldocument() # TODO: error handling - epub = doc.as_epub().get_string() - response = HttpResponse(mimetype='application/epub+zip') + epub = doc.as_epub(ilustr_path=book.gallery_path()).get_string() + response = HttpResponse(content_type='application/epub+zip') response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.epub' response.write(epub) return response +@never_cache +def book_mobi(request, slug): + book = get_object_or_404(Book, slug=slug) + if not book.accessible(request): + return HttpResponseForbidden("Not authorized.") + + # TODO: move to celery + doc = book.wldocument() + # TODO: error handling + mobi = doc.as_mobi(ilustr_path=book.gallery_path()).get_string() + response = HttpResponse(content_type='application/x-mobipocket-ebook') + response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.mobi' + response.write(mobi) + return response + + @never_cache def revision(request, slug, chunk=None): try: @@ -303,10 +327,10 @@ def book(request, slug): form = forms.ReadonlyBookForm(instance=book) editable = False - publish_error = publishable_error(book) + publish_error = book.publishable_error() publishable = publish_error is None - return direct_to_template(request, "catalogue/book_detail.html", extra_context={ + return render(request, "catalogue/book_detail.html", { "book": book, "publishable": publishable, "publishable_error": publish_error, @@ -315,6 +339,36 @@ def book(request, slug): }) +def image(request, slug): + image = get_object_or_404(Image, slug=slug) + if not image.accessible(request): + return HttpResponseForbidden("Not authorized.") + + if request.user.has_perm('catalogue.change_image'): + if request.method == "POST": + form = forms.ImageForm(request.POST, instance=image) + if form.is_valid(): + form.save() + return http.HttpResponseRedirect(image.get_absolute_url()) + else: + form = forms.ImageForm(instance=image) + editable = True + else: + form = forms.ReadonlyImageForm(instance=image) + editable = False + + publish_error = image.publishable_error() + publishable = publish_error is None + + return render(request, "catalogue/image_detail.html", { + "object": image, + "publishable": publishable, + "publishable_error": publish_error, + "form": form, + "editable": editable, + }) + + @permission_required('catalogue.add_chunk') def chunk_add(request, slug, chunk): try: @@ -346,12 +400,13 @@ def chunk_add(request, slug, chunk): "title": "cz. %d" % (doc.number + 1, ), }) - return direct_to_template(request, "catalogue/chunk_add.html", extra_context={ + return render(request, "catalogue/chunk_add.html", { "chunk": doc, "form": form, }) +@login_required def chunk_edit(request, slug, chunk): try: doc = Chunk.get(slug, chunk) @@ -381,31 +436,95 @@ def chunk_edit(request, slug, chunk): else: go_next = '' - return direct_to_template(request, "catalogue/chunk_edit.html", extra_context={ + return render(request, "catalogue/chunk_edit.html", { "chunk": doc, "form": form, "go_next": go_next, }) -@transaction.commit_on_success +@transaction.atomic +@login_required +@require_POST def chunk_mass_edit(request): - if request.method == 'POST': - ids = map(int, request.POST.get('ids').split(',')) - chunks = map(lambda i: Chunk.objects.get(id=i), ids) + ids = map(int, filter(lambda i: i.strip()!='', request.POST.get('ids').split(','))) + chunks = map(lambda i: Chunk.objects.get(id=i), ids) + + stage = request.POST.get('stage') + if stage: + try: + stage = Chunk.tag_model.objects.get(slug=stage) + except Chunk.DoesNotExist, e: + stage = None + + for c in chunks: c.stage = stage + + username = request.POST.get('user') + logger.info("username: %s" % username) + logger.info(request.POST) + if username: try: - stage = Chunk.tag_model.objects.get(slug=request.POST.get('stage')) - for c in chunks: c.stage = stage - except KeyError: pass + user = User.objects.get(username=username) + except User.DoesNotExist, e: + user = None + + for c in chunks: c.user = user + project_id = request.POST.get('project') + if project_id: try: - user = User.objects.get(username=request.POST.get('user')) - for c in chunks: c.user = user - except KeyError: pass + project = Project.objects.get(pk=int(project_id)) + except (Project.DoesNotExist, ValueError), e: + project = None + for c in chunks: + book = c.book + book.project = project + book.save() - for c in chunks: c.save() - else: - raise Http404 + for c in chunks: c.save() + + return HttpResponse("", content_type="text/plain") + + +@transaction.atomic +@login_required +@require_POST +def image_mass_edit(request): + ids = map(int, filter(lambda i: i.strip()!='', request.POST.get('ids').split(','))) + images = map(lambda i: Image.objects.get(id=i), ids) + + stage = request.POST.get('stage') + if stage: + try: + stage = Image.tag_model.objects.get(slug=stage) + except Image.DoesNotExist, e: + stage = None + + for c in images: c.stage = stage + + username = request.POST.get('user') + logger.info("username: %s" % username) + logger.info(request.POST) + if username: + try: + user = User.objects.get(username=username) + except User.DoesNotExist, e: + user = None + + for c in images: c.user = user + + project_id = request.POST.get('project') + if project_id: + try: + project = Project.objects.get(pk=int(project_id)) + except (Project.DoesNotExist, ValueError), e: + project = None + for c in images: + c.project = project + + for c in images: c.save() + + return HttpResponse("", content_type="text/plain") @permission_required('catalogue.change_book') @@ -422,7 +541,7 @@ def book_append(request, slug): return http.HttpResponseRedirect(append_to.get_absolute_url()) else: form = forms.BookAppendForm(book) - return direct_to_template(request, "catalogue/book_append_to.html", extra_context={ + return render(request, "catalogue/book_append_to.html", { "book": book, "form": form, @@ -438,10 +557,79 @@ def publish(request, slug): return HttpResponseForbidden("Not authorized.") try: - book.publish(request.user) + protocol = 'https://' if request.is_secure() else 'http://' + book.publish(request.user, host=protocol + request.get_host()) except NotAuthorizedError: return http.HttpResponseRedirect(reverse('apiclient_oauth')) except BaseException, e: return http.HttpResponse(e) else: return http.HttpResponseRedirect(book.get_absolute_url()) + + +@require_POST +@login_required +def publish_image(request, slug): + image = get_object_or_404(Image, slug=slug) + if not image.accessible(request): + return HttpResponseForbidden("Not authorized.") + + try: + image.publish(request.user) + except NotAuthorizedError: + return http.HttpResponseRedirect(reverse('apiclient_oauth')) + except BaseException, e: + return http.HttpResponse(e) + else: + return http.HttpResponseRedirect(image.get_absolute_url()) + + +class GalleryView(UploadView): + def get_object(self, request, slug): + book = get_object_or_404(Book, slug=slug) + if not book.gallery: + raise Http404 + return book + + def breadcrumbs(self): + return [ + (_('books'), reverse('catalogue_document_list')), + (self.object.title, self.object.get_absolute_url()), + (_('scan gallery'),), + ] + + def get_directory(self): + return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery) + + +def active_users_list(request): + since = date(date.today().year, 1, 1) + by_user = defaultdict(lambda: 0) + by_email = defaultdict(lambda: 0) + names_by_email = defaultdict(set) + for change_model in (Chunk.change_model, Image.change_model): + for c in change_model.objects.filter( + created_at__gte=since).order_by( + 'author', 'author_email', 'author_name').values( + 'author', 'author_name', 'author_email').annotate( + c=Count('author'), ce=Count('author_email')).distinct(): + if c['author']: + by_user[c['author']] += c['c'] + else: + by_email[c['author_email']] += c['ce'] + if c['author_name'].strip(): + names_by_email[c['author_email']].add(c['author_name']) + for user in User.objects.filter(pk__in=by_user): + by_email[user.email] += by_user[user.pk] + names_by_email[user.email].add("%s %s" % (user.first_name, user.last_name)) + + active_users = [] + for email, count in by_email.items(): + active_users.append((email, names_by_email[email], count)) + active_users.sort(key=lambda x: -x[2]) + return render(request, 'catalogue/active_users_list.html', { + 'users': active_users, + 'since': since, + }) + +