X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/36f6233fd79390ad5af8a1532eac60a0ae57c825..b5f8d214ba00903379f8716ef563f19743a120b6:/apps/wiki/views.py diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 46f0665f..4348cb85 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -1,47 +1,66 @@ import os +import functools +import logging +logger = logging.getLogger("fnp.wiki") 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 +from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError, + ajax_require_permission, recursive_groupby) from django import http -from wiki.models import getstorage, DocumentNotFound -from wiki.forms import DocumentTextSaveForm, DocumentTagForm, DocumentCreateForm +from wiki.models import getstorage, DocumentNotFound, normalize_name, split_name, join_name, Theme +from wiki.forms import DocumentTextSaveForm, 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.middleware.gzip import GZipMiddleware -import wlapi # # 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 wlapi import nice_diff import operator 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, template_name='wiki/document_list.html'): - # TODO: find a way to cache "Storage All" - return direct_to_template(request, template_name, extra_context={ - 'document_list': getstorage().all(), +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 -def document_detail(request, name, template_name='wiki/document_details.html'): +@normalized_name +def editor(request, name, template_name='wiki/document_details.html'): storage = getstorage() try: @@ -67,17 +86,20 @@ def document_detail(request, name, template_name='wiki/document_details.html'): "text_save": DocumentTextSaveForm(prefix="textsave"), "add_tag": DocumentTagForm(prefix="addtag"), }, + 'REDMINE_URL': settings.REDMINE_URL, }) @require_GET -def document_detail_readonly(request, name, template_name='wiki/document_details_readonly.html'): +@normalized_name +def editor_readonly(request, name, template_name='wiki/document_details_readonly.html'): + name = normalize_name(name) storage = getstorage() try: revision = request.GET['revision'] document = storage.get(name, revision) - except (KeyError, DocumentNotFound) as e: + except (KeyError, DocumentNotFound): raise http.Http404 access_time = datetime.now() @@ -94,21 +116,23 @@ def document_detail_readonly(request, name, template_name='wiki/document_details 'document_name': document.name, 'document_info': dict(document.info(), readonly=True), 'document_meta': document.meta, + 'REDMINE_URL': settings.REDMINE_URL, }) -def document_create_missing(request, name): +@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( - id=form.cleaned_data['id'], + name=form.cleaned_data['id'], text=form.cleaned_data['text'], ) - return http.HttpResponseRedirect(reverse("wiki_details", args=[doc.name])) + return http.HttpResponseRedirect(reverse("wiki_editor", args=[doc.name])) else: form = DocumentCreateForm(initial={ "id": name.replace(" ", "_"), @@ -121,27 +145,87 @@ def document_create_missing(request, name): }) +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 -def document_text(request, name): +@normalized_name +@decorator_from_middleware(GZipMiddleware) +def text(request, name): storage = getstorage() if request.method == 'POST': form = DocumentTextSaveForm(request.POST, prefix="textsave") - if form.is_valid(): revision = form.cleaned_data['parent_revision'] - - document = storage.get_or_404(name, revision) + document = storage.get_or_404(name, 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, - ) - - document = storage.get(name) - + 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 + 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) return JSONResponse({ 'text': document.plain_text if revision != document.revision else None, 'meta': document.meta(), @@ -172,7 +256,25 @@ def document_text(request, name): @never_cache -def document_gallery(request, directory): +@normalized_name +@require_POST +def revert(request, name): + storage = getstorage() + revision = request.POST['target_revision'] + + try: + document = storage.revert(name, revision) + + return JSONResponse({ + 'text': document.plain_text if revision != document.revision else None, + 'meta': document.meta(), + 'revision': document.revision, + }) + except DocumentNotFound: + raise http.Http404 + +@never_cache +def gallery(request, directory): try: base_url = ''.join(( smart_unicode(settings.MEDIA_URL), @@ -193,13 +295,14 @@ 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) as e: + except (IndexError, OSError): logger.exception("Unable to fetch gallery") raise http.Http404 @never_cache -def document_diff(request, name): +@normalized_name +def diff(request, name): storage = getstorage() revA = int(request.GET.get('from', 0)) @@ -219,7 +322,8 @@ def document_diff(request, name): @never_cache -def document_history(request, name): +@normalized_name +def history(request, name): storage = getstorage() # TODO: pagination @@ -230,7 +334,8 @@ def document_history(request, name): @require_POST @ajax_require_permission('wiki.can_change_tags') -def document_add_tag(request, name): +def add_tag(request, name): + name = normalize_name(name) storage = getstorage() form = DocumentTagForm(request.POST, prefix="addtag") @@ -246,7 +351,9 @@ def document_add_tag(request, name): @require_POST @ajax_require_permission('wiki.can_publish') -def document_publish(request, name): +def publish(request, name): + name = normalize_name(name) + storage = getstorage() document = storage.get_by_tag(name, "ready_to_publish") @@ -256,3 +363,8 @@ def document_publish(request, name): 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)]))