X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d0928737c06697f6284101bfded61cb8d933ce34..c01fccbb9d539a32d17e3675e36d92b7a4adf568:/apps/wiki/views.py?ds=inline diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 918eb91d..34f02407 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,296 +1,200 @@ +from datetime import datetime import os -import functools import logging -logger = logging.getLogger("fnp.wiki") +from time import mktime +import urllib from django.conf import settings - -from django.views.generic.simple import direct_to_template -from django.views.decorators.http import require_POST, require_GET from django.core.urlresolvers import reverse -from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, - ajax_require_permission, recursive_groupby) from django import http - -from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name, Theme -from wiki.forms import DocumentTextSaveForm, DocumentTextRevertForm, DocumentTagForm, DocumentCreateForm, DocumentsUploadForm -from datetime import datetime -from django.utils.encoding import smart_unicode -from django.utils.translation import ugettext_lazy as _ -from django.utils.decorators import decorator_from_middleware +from django.http import Http404, HttpResponseForbidden from django.middleware.gzip import GZipMiddleware +from django.utils.decorators import decorator_from_middleware +from django.utils.encoding import smart_unicode +from django.utils.formats import localize +from django.utils.translation import ugettext as _ +from django.views.decorators.http import require_POST, require_GET +from django.shortcuts import get_object_or_404, render +from catalogue.models import Book, Chunk +import nice_diff +from wiki import forms +from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, + ajax_require_permission) +from wiki.models import Theme # # Quick hack around caching problems, TODO: use ETags # from django.views.decorators.cache import never_cache -import wlapi -import nice_diff -import operator +logger = logging.getLogger("fnp.wiki") MAX_LAST_DOCS = 10 -def normalized_name(view): - - @functools.wraps(view) - def decorated(request, name, *args): - normalized = normalize_name(name) - logger.debug('View check %r -> %r', name, normalized) - - if normalized != name: - return http.HttpResponseRedirect( - reverse('wiki_' + view.__name__, kwargs={'name': normalized})) - - return view(request, name, *args) - - return decorated - - -@never_cache -def document_list(request): - return direct_to_template(request, 'wiki/document_list.html', extra_context={ - 'docs': getstorage().all(), - 'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(), - key=operator.itemgetter(1), reverse=True), - }) - - @never_cache -@normalized_name -def editor(request, name, template_name='wiki/document_details.html'): - storage = getstorage() - +def editor(request, slug, chunk=None, template_name='wiki/document_details.html'): try: - document = storage.get(name) - except DocumentNotFound: - return http.HttpResponseRedirect(reverse("wiki_create_missing", args=[name])) + chunk = Chunk.get(slug, chunk) + except Chunk.MultipleObjectsReturned: + # TODO: choice page + raise Http404 + except Chunk.DoesNotExist: + if chunk is None: + try: + book = Book.objects.get(slug=slug) + except Book.DoesNotExist: + return http.HttpResponseRedirect(reverse("catalogue_create_missing", args=[slug])) + else: + raise Http404 + if not chunk.book.accessible(request): + return HttpResponseForbidden("Not authorized.") access_time = datetime.now() - last_documents = request.session.get("wiki_last_docs", {}) - last_documents[name] = access_time - - if len(last_documents) > MAX_LAST_DOCS: - oldest_key = min(last_documents, key=last_documents.__getitem__) - del last_documents[oldest_key] - request.session['wiki_last_docs'] = last_documents - - return direct_to_template(request, template_name, extra_context={ - 'document': document, - 'document_name': document.name, - 'document_info': document.info, - 'document_meta': document.meta, + last_books = request.session.get("wiki_last_books", {}) + last_books[reverse(editor, args=[chunk.book.slug, chunk.slug])] = { + 'time': mktime(access_time.timetuple()), + 'title': chunk.pretty_name(), + } + + if len(last_books) > MAX_LAST_DOCS: + oldest_key = min(last_books, key=lambda x: last_books[x]['time']) + del last_books[oldest_key] + request.session['wiki_last_books'] = last_books + + return render(request, template_name, { + 'chunk': chunk, 'forms': { - "text_save": DocumentTextSaveForm(prefix="textsave"), - "text_revert": DocumentTextRevertForm(prefix="textrevert"), - "add_tag": DocumentTagForm(prefix="addtag"), + "text_save": forms.DocumentTextSaveForm(user=request.user, prefix="textsave"), + "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"), + "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"), }, + 'can_pubmark': request.user.has_perm('catalogue.can_pubmark'), 'REDMINE_URL': settings.REDMINE_URL, }) @require_GET -@normalized_name -def editor_readonly(request, name, template_name='wiki/document_details_readonly.html'): - name = normalize_name(name) - storage = getstorage() - +def editor_readonly(request, slug, chunk=None, template_name='wiki/document_details_readonly.html'): try: + chunk = Chunk.get(slug, chunk) revision = request.GET['revision'] - document = storage.get(name, revision) - except (KeyError, DocumentNotFound): - raise http.Http404 + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist, KeyError): + raise Http404 + if not chunk.book.accessible(request): + return HttpResponseForbidden("Not authorized.") access_time = datetime.now() - last_documents = request.session.get("wiki_last_docs", {}) - last_documents[name] = access_time - - if len(last_documents) > MAX_LAST_DOCS: - oldest_key = min(last_documents, key=last_documents.__getitem__) - del last_documents[oldest_key] - request.session['wiki_last_docs'] = last_documents - - return direct_to_template(request, template_name, extra_context={ - 'document': document, - 'document_name': document.name, - 'document_info': dict(document.info(), readonly=True), - 'document_meta': document.meta, + last_books = request.session.get("wiki_last_books", {}) + last_books[slug, chunk.slug] = { + 'time': mktime(access_time.timetuple()), + 'title': chunk.book.title, + } + + if len(last_books) > MAX_LAST_DOCS: + oldest_key = min(last_books, key=lambda x: last_books[x]['time']) + del last_books[oldest_key] + request.session['wiki_last_books'] = last_books + + return render(request, template_name, { + 'chunk': chunk, + 'revision': revision, + 'readonly': True, 'REDMINE_URL': settings.REDMINE_URL, }) -@normalized_name -def create_missing(request, name): - storage = getstorage() - - if request.method == "POST": - form = DocumentCreateForm(request.POST, request.FILES) - if form.is_valid(): - doc = storage.create_document( - name=form.cleaned_data['id'], - text=form.cleaned_data['text'], - ) - - return http.HttpResponseRedirect(reverse("wiki_editor", args=[doc.name])) - else: - form = DocumentCreateForm(initial={ - "id": name.replace(" ", "_"), - "title": name.title(), - }) - - return direct_to_template(request, "wiki/document_create_missing.html", extra_context={ - "document_name": name, - "form": form, - }) - - -def upload(request): - storage = getstorage() - - if request.method == "POST": - form = DocumentsUploadForm(request.POST, request.FILES) - if form.is_valid(): - zip = form.cleaned_data['zip'] - skipped_list = [] - ok_list = [] - error_list = [] - titles = {} - existing = storage.all() - for filename in zip.namelist(): - if filename[-1] == '/': - continue - title = normalize_name(os.path.basename(filename)[:-4]) - if not (title and filename.endswith('.xml')): - skipped_list.append(filename) - elif title in titles: - error_list.append((filename, title, _('Title already used for %s' % titles[title]))) - elif title in existing: - error_list.append((filename, title, _('Title already used in repository.'))) - else: - try: - zip.read(filename).decode('utf-8') # test read - ok_list.append((filename, title)) - except UnicodeDecodeError: - error_list.append((filename, title, _('File should be UTF-8 encoded.'))) - titles[title] = filename - - if not error_list: - for filename, title in ok_list: - storage.create_document( - name=title, - text=zip.read(filename).decode('utf-8') - ) - - return direct_to_template(request, "wiki/document_upload.html", extra_context={ - "form": form, - "ok_list": ok_list, - "skipped_list": skipped_list, - "error_list": error_list, - }) - #doc = storage.create_document( - # name=base, - # text=form.cleaned_data['text'], - - - return http.HttpResponse('\n'.join(yeslist) + '\n\n' + '\n'.join(nolist)) - else: - form = DocumentsUploadForm() - - return direct_to_template(request, "wiki/document_upload.html", extra_context={ - "form": form, - }) - - @never_cache -@normalized_name @decorator_from_middleware(GZipMiddleware) -def text(request, name): - storage = getstorage() +def text(request, chunk_id): + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") if request.method == 'POST': - form = DocumentTextSaveForm(request.POST, prefix="textsave") + form = forms.DocumentTextSaveForm(request.POST, user=request.user, prefix="textsave") if form.is_valid(): - revision = form.cleaned_data['parent_revision'] - document = storage.get_or_404(name, revision) - document.text = form.cleaned_data['text'] - comment = form.cleaned_data['comment'] - if form.cleaned_data['stage_completed']: - comment += '\n#stage-finished: %s\n' % form.cleaned_data['stage_completed'] if request.user.is_authenticated(): - author_name = request.user - author_email = request.user.email + author = request.user else: - author_name = form.cleaned_data['author_name'] - author_email = form.cleaned_data['author_email'] - author = "%s <%s>" % (author_name, author_email) - storage.put(document, author=author, comment=comment, parent=revision) - document = storage.get(name) + author = None + text = form.cleaned_data['text'] + parent_revision = form.cleaned_data['parent_revision'] + if parent_revision is not None: + parent = doc.at_revision(parent_revision) + else: + parent = None + stage = form.cleaned_data['stage_completed'] + tags = [stage] if stage else [] + publishable = (form.cleaned_data['publishable'] and + request.user.has_perm('catalogue.can_pubmark')) + doc.commit(author=author, + text=text, + parent=parent, + description=form.cleaned_data['comment'], + tags=tags, + author_name=form.cleaned_data['author_name'], + author_email=form.cleaned_data['author_email'], + publishable=publishable, + ) + revision = doc.revision() return JSONResponse({ - 'text': document.plain_text if revision != document.revision else None, - 'meta': document.meta(), - 'revision': document.revision, + 'text': doc.materialize() if parent_revision != revision else None, + 'meta': {}, + 'revision': revision, }) else: return JSONFormInvalid(form) else: revision = request.GET.get("revision", None) - + try: - try: - revision = revision and int(revision) - logger.info("Fetching %s", revision) - document = storage.get(name, revision) - except ValueError: - # treat as a tag - logger.info("Fetching tag %s", revision) - document = storage.get_by_tag(name, revision) - except DocumentNotFound: - raise http.Http404 + revision = int(revision) + except (ValueError, TypeError): + revision = doc.revision() + + if revision is not None: + text = doc.at_revision(revision).materialize() + else: + text = '' return JSONResponse({ - 'text': document.plain_text, - 'meta': document.meta(), - 'revision': document.revision, + 'text': text, + 'meta': {}, + 'revision': revision, }) @never_cache -@normalized_name @require_POST -def revert(request, name): - storage = getstorage() - form = DocumentTextRevertForm(request.POST, prefix="textrevert") +def revert(request, chunk_id): + form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert") if form.is_valid(): - print 'valid' + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") + revision = form.cleaned_data['revision'] comment = form.cleaned_data['comment'] comment += "\n#revert to %s" % revision if request.user.is_authenticated(): - author_name = request.user - author_email = request.user.email + author = request.user else: - author_name = form.cleaned_data['author_name'] - author_email = form.cleaned_data['author_email'] - author = "%s <%s>" % (author_name, author_email) - - before = storage.get(name).revision - logger.info("Reverting %s to %s", name, revision) - storage.revert(name, revision, comment=comment, author=author) - logger.info("Fetching %s", name) - document = storage.get(name) + author = None + before = doc.revision() + logger.info("Reverting %s to %s", chunk_id, revision) + doc.at_revision(revision).revert(author=author, description=comment) return JSONResponse({ - 'text': document.plain_text if before != document.revision else None, - 'meta': document.meta(), - 'revision': document.revision, + 'text': doc.materialize() if before != doc.revision() else None, + 'meta': {}, + 'revision': doc.revision(), }) else: - print 'invalid' return JSONFormInvalid(form) @@ -299,22 +203,26 @@ def gallery(request, directory): try: base_url = ''.join(( smart_unicode(settings.MEDIA_URL), - smart_unicode(settings.FILEBROWSER_DIRECTORY), + smart_unicode(settings.IMAGE_DIR), smart_unicode(directory))) base_dir = os.path.join( smart_unicode(settings.MEDIA_ROOT), - smart_unicode(settings.FILEBROWSER_DIRECTORY), + smart_unicode(settings.IMAGE_DIR), smart_unicode(directory)) def map_to_url(filename): - return "%s/%s" % (base_url, smart_unicode(filename)) + return urllib.quote("%s/%s" % (base_url, smart_unicode(filename))) def is_image(filename): return os.path.splitext(f)[1].lower() in (u'.jpg', u'.jpeg', u'.png') images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)] images.sort() + + if not request.user.is_authenticated(): + return HttpResponseForbidden("Not authorized.") + return JSONResponse(images) except (IndexError, OSError): logger.exception("Unable to fetch gallery") @@ -322,10 +230,7 @@ def gallery(request, directory): @never_cache -@normalized_name -def diff(request, name): - storage = getstorage() - +def diff(request, chunk_id): revA = int(request.GET.get('from', 0)) revB = int(request.GET.get('to', 0)) @@ -335,68 +240,73 @@ def diff(request, name): if revB == 0: revB = None - docA = storage.get_or_404(name, int(revA)) - docB = storage.get_or_404(name, int(revB)) + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") - return http.HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(), - docB.plain_text.splitlines(), context=3)) + # allow diff from the beginning + if revA: + docA = doc.at_revision(revA).materialize() + else: + docA = "" + docB = doc.at_revision(revB).materialize() + return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), + docB.splitlines(), context=3)) -@never_cache -@normalized_name -def revision(request, name): - storage = getstorage() - try: - return http.HttpResponse(str(storage.doc_meta(name)['revision'])) - except DocumentNotFound: - raise http.Http404 +@never_cache +def revision(request, chunk_id): + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") + return http.HttpResponse(str(doc.revision())) @never_cache -@normalized_name -def history(request, name): - storage = getstorage() - +def history(request, chunk_id): # TODO: pagination - changesets = list(storage.history(name)) - - return JSONResponse(changesets) + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") + + changes = [] + for change in doc.history().reverse(): + changes.append({ + "version": change.revision, + "description": change.description, + "author": change.author_str(), + "date": localize(change.created_at), + "publishable": _("Publishable") + "\n" if change.publishable else "", + "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()), + "published": _("Published") + ": " + \ + localize(change.publish_log.order_by('-book_record__timestamp')[0].book_record.timestamp) \ + if change.publish_log.exists() else "", + }) + return JSONResponse(changes) @require_POST -@ajax_require_permission('wiki.can_change_tags') -def add_tag(request, name): - name = normalize_name(name) - storage = getstorage() - - form = DocumentTagForm(request.POST, prefix="addtag") +@ajax_require_permission('catalogue.can_pubmark') +def pubmark(request, chunk_id): + form = forms.DocumentPubmarkForm(request.POST, prefix="pubmark") if form.is_valid(): - doc = storage.get_or_404(form.cleaned_data['id']) - doc.add_tag(tag=form.cleaned_data['tag'], - revision=form.cleaned_data['revision'], - author=request.user.username) - return JSONResponse({"message": _("Tag added")}) + doc = get_object_or_404(Chunk, pk=chunk_id) + if not doc.book.accessible(request): + return HttpResponseForbidden("Not authorized.") + + revision = form.cleaned_data['revision'] + publishable = form.cleaned_data['publishable'] + change = doc.at_revision(revision) + if publishable != change.publishable: + change.set_publishable(publishable) + return JSONResponse({"message": _("Revision marked")}) + else: + return JSONResponse({"message": _("Nothing changed")}) else: return JSONFormInvalid(form) -@require_POST -@ajax_require_permission('wiki.can_publish') -def publish(request, name): - name = normalize_name(name) - - storage = getstorage() - document = storage.get_by_tag(name, "ready_to_publish") - - api = wlapi.WLAPI(**settings.WL_API_CONFIG) - - try: - return JSONResponse({"result": api.publish_book(document)}) - except wlapi.APICallException, e: - return JSONServerError({"message": str(e)}) - - def themes(request): prefix = request.GET.get('q', '') return http.HttpResponse('\n'.join([str(t) for t in Theme.objects.filter(name__istartswith=prefix)]))