X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/24c1d259ba4af084959d70c6a1f355d0a57f1191..9b3a6ae7c832a9db4e162bc47859b2347b16dac3:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 64e93305..75650e09 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,98 +1,186 @@ +from datetime import datetime import os +import logging from django.conf import settings -from django.views.generic.simple import direct_to_template -from django.views.decorators.http import require_POST -from .helpers import JSONResponse, JSONFormInvalid, JSONServerError +from django.core.urlresolvers import reverse from django import http - -from wiki.models import getstorage -from wiki.forms import DocumentForm, DocumentTextSaveForm, DocumentTagForm -from datetime import datetime +from django.http import Http404 +from django.middleware.gzip import GZipMiddleware +from django.utils.decorators import decorator_from_middleware from django.utils.encoding import smart_unicode -import wlapi +from django.utils.translation import ugettext_lazy as _ +from django.views.decorators.http import require_POST, require_GET +from django.views.generic.simple import direct_to_template + +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 logging -logger = logging.getLogger("fnp.peanut.api") - -import nice_diff -import operator +logger = logging.getLogger("fnp.wiki") MAX_LAST_DOCS = 10 @never_cache -def document_list(request, template_name='wiki/document_list.html'): - # TODO: find a way to cache "Storage All" +def editor(request, slug, chunk=None, template_name='wiki/document_details.html'): + try: + 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 + + access_time = datetime.now() + last_books = request.session.get("wiki_last_books", {}) + last_books[slug, chunk.slug] = { + 'time': access_time, + '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 direct_to_template(request, template_name, extra_context={ - 'document_list': getstorage().all(), - 'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(), - key=operator.itemgetter(1), reverse=True), + 'chunk': chunk, + 'forms': { + "text_save": forms.DocumentTextSaveForm(prefix="textsave"), + "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"), + "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"), + }, + 'REDMINE_URL': settings.REDMINE_URL, }) -@never_cache -def document_detail(request, name, template_name='wiki/document_details.html'): - - document = getstorage().get_or_404(name) +@require_GET +def editor_readonly(request, slug, chunk=None, template_name='wiki/document_details_readonly.html'): + try: + chunk = Chunk.get(slug, chunk) + revision = request.GET['revision'] + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist, KeyError): + raise Http404 access_time = datetime.now() - last_documents = request.session.get("wiki_last_docs", {}) - last_documents[name] = access_time + last_books = request.session.get("wiki_last_books", {}) + last_books[slug, chunk.slug] = { + 'time': access_time, + 'title': chunk.book.title, + } - 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 + 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 direct_to_template(request, template_name, extra_context={ - 'document': document, - 'document_info': document.info, - 'document_meta': document.meta, - 'forms': {"text_save": DocumentTextSaveForm(), "add_tag": DocumentTagForm()}, + 'chunk': chunk, + 'revision': revision, + 'readonly': True, + 'REDMINE_URL': settings.REDMINE_URL, }) @never_cache -def document_text(request, name): - storage = getstorage() - document = storage.get_or_404(name) +@decorator_from_middleware(GZipMiddleware) +def text(request, slug, chunk=None): + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 if request.method == 'POST': - form = DocumentTextSaveForm(request.POST) - + form = forms.DocumentTextSaveForm(request.POST, prefix="textsave") if form.is_valid(): - revision = form.cleaned_data['parent_revision'] - document.text = form.cleaned_data['text'] - - storage.put(document, - author=form.cleaned_data['author'] or request.user.username, - comment=form.cleaned_data['comment'], - parent=revision, - ) - + if request.user.is_authenticated(): + author = request.user + else: + author = None + text = form.cleaned_data['text'] + parent_revision = form.cleaned_data['parent_revision'] + parent = doc.at_revision(parent_revision) + stage = form.cleaned_data['stage_completed'] + tags = [stage] if stage else [] + doc.commit(author=author, + text=text, + parent=parent, + description=form.cleaned_data['comment'], + tags=tags, + ) + 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: + revision = int(revision) + except (ValueError, TypeError): + revision = None + + return JSONResponse({ + 'text': doc.at_revision(revision).materialize(), + 'meta': {}, + 'revision': revision if revision else doc.revision(), + }) + + +@never_cache +@require_POST +def revert(request, slug, chunk=None): + form = forms.DocumentTextRevertForm(request.POST, prefix="textrevert") + if form.is_valid(): + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + + revision = form.cleaned_data['revision'] + + comment = form.cleaned_data['comment'] + comment += "\n#revert to %s" % revision + + if request.user.is_authenticated(): + author = request.user + else: + author = None + + before = doc.revision() + logger.info("Reverting %s to %s", slug, revision) + doc.at_revision(revision).revert(author=author, description=comment) + return JSONResponse({ - 'text': document.plain_text, - 'meta': document.meta(), - 'revision': document.revision(), + 'text': doc.materialize() if before != doc.revision() else None, + 'meta': {}, + 'revision': doc.revision(), }) + else: + return JSONFormInvalid(form) @never_cache -def document_gallery(request, directory): +def gallery(request, directory): try: base_url = ''.join(( smart_unicode(settings.MEDIA_URL), @@ -113,16 +201,13 @@ def document_gallery(request, directory): images = [map_to_url(f) for f in map(smart_unicode, os.listdir(base_dir)) if is_image(f)] images.sort() return JSONResponse(images) - except (IndexError, OSError), exc: - import traceback - traceback.print_exc() + except (IndexError, OSError): + logger.exception("Unable to fetch gallery") raise http.Http404 @never_cache -def document_diff(request, name): - storage = getstorage() - +def diff(request, slug, chunk=None): revA = int(request.GET.get('from', 0)) revB = int(request.GET.get('to', 0)) @@ -132,41 +217,70 @@ def document_diff(request, name): if revB == 0: revB = None - docA = storage.get_or_404(name, int(revA)) - docB = storage.get_or_404(name, int(revB)) + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + docA = doc.at_revision(revA).materialize() + docB = doc.at_revision(revB).materialize() - return http.HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(), - docB.plain_text.splitlines())) + return http.HttpResponse(nice_diff.html_diff_table(docA.splitlines(), + docB.splitlines(), context=3)) @never_cache -def document_history(request, name): - storage = getstorage() - return JSONResponse(storage.history(name)) +def revision(request, slug, chunk=None): + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + return http.HttpResponse(str(doc.revision())) -@require_POST -def document_add_tag(request, name): - storage = getstorage() +@never_cache +def history(request, slug, chunk=None): + # TODO: pagination + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + + changes = [] + for change in doc.history().order_by('-created_at'): + changes.append({ + "version": change.revision, + "description": change.description, + "author": change.author_str(), + "date": change.created_at, + "publishable": "Publishable\n" if change.publishable else "", + "tag": ',\n'.join(unicode(tag) for tag in change.tags.all()), + }) + return JSONResponse(changes) + - form = DocumentTagForm(request.POST) +@require_POST +@ajax_require_permission('wiki.can_pubmark') +def pubmark(request, slug, chunk=None): + form = forms.DocumentPubmarkForm(request.POST, prefix="pubmark") if form.is_valid(): - doc = storage.get_or_404(name, form.cleaned_data['version']) - doc.add_tag(form.cleaned_data['tag']) - return JSONResponse({"message": _("Tag added")}) + try: + doc = Chunk.get(slug, chunk) + except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist): + raise Http404 + + revision = form.cleaned_data['revision'] + publishable = form.cleaned_data['publishable'] + change = doc.at_revision(revision) + if publishable != change.publishable: + change.publishable = publishable + change.save() + return JSONResponse({"message": _("Revision marked")}) + else: + return JSONResponse({"message": _("Nothing changed")}) else: return JSONFormInvalid(form) -@require_POST -def document_publish(request, name, version): - storage = getstorage() - - # get the document - document = storage.get_or_404(name, revision=int(version)) - - 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)]))