Fixed requirements. Rewrote deployment script to use github.

[redakcja.git] / apps / wiki / views.py

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 4f808f0..64e9330 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -2,46 +2,171 @@ import os
 
 from django.conf import settings
 from django.views.generic.simple import direct_to_template
 
 from django.conf import settings
 from django.views.generic.simple import direct_to_template

-from django.http import HttpResponse, Http404
-from django.utils import simplejson as json
+from django.views.decorators.http import require_POST
+from .helpers import JSONResponse, JSONFormInvalid, JSONServerError
+from django import http

 
 

-from wiki.models import storage, Document, DocumentNotFound
-from wiki.forms import DocumentForm
+from wiki.models import getstorage
+from wiki.forms import DocumentForm, DocumentTextSaveForm, DocumentTagForm
+from datetime import datetime
+from django.utils.encoding import smart_unicode
+import wlapi

 
 

-def document_list(request, template_name = 'wiki/document_list.html'):
-    return direct_to_template(request, template_name, extra_context = {
-        'document_list': storage.all(),
+#
+# 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
+
+MAX_LAST_DOCS = 10
+
+
+@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(),
+        'last_docs': sorted(request.session.get("wiki_last_docs", {}).items(),
+                        key=operator.itemgetter(1), reverse=True),

     })
 
 
     })
 
 

-def document_detail(request, name, template_name = 'wiki/document_details.html'):
-    try:
-        document = storage.get(name)
-    except DocumentNotFound:
-        document = Document(storage, name = name, text = '')
+@never_cache
+def document_detail(request, name, template_name='wiki/document_details.html'):

 
 

+    document = getstorage().get_or_404(name)
+
+    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_info': document.info,
+        'document_meta': document.meta,
+        'forms': {"text_save": DocumentTextSaveForm(), "add_tag": DocumentTagForm()},
+    })
+
+
+@never_cache
+def document_text(request, name):
+    storage = getstorage()
+    document = storage.get_or_404(name)

 
     if request.method == 'POST':
 
     if request.method == 'POST':

-        form = DocumentForm(request.POST, instance = document)
+        form = DocumentTextSaveForm(request.POST)
+

         if form.is_valid():
         if form.is_valid():

-            document = form.save()
-            return HttpResponse(json.dumps({'text': document.plain_text(), 'meta': document.meta(), 'revision': document.revision()}))
+            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,
+            )
+
+            return JSONResponse({
+                'text': document.plain_text if revision != document.revision() else None,
+                'meta': document.meta(),
+                'revision': document.revision(),
+            })

         else:
         else:

-            return HttpResponse(json.dumps({'errors': form.errors}))
+            return JSONFormInvalid(form)

     else:
     else:

-        form = DocumentForm(instance = document)
-
-    return direct_to_template(request, template_name, extra_context = {
-        'document': document,
-        'form': form,
-    })
+        return JSONResponse({
+            'text': document.plain_text,
+            'meta': document.meta(),
+            'revision': document.revision(),
+        })

 
 
 
 

+@never_cache

 def document_gallery(request, directory):
     try:
 def document_gallery(request, directory):
     try:

-        base_dir = os.path.join(settings.MEDIA_ROOT, settings.FILEBROWSER_DIRECTORY, directory)
-        images = [u'%s%s%s/%s' % (settings.MEDIA_URL, settings.FILEBROWSER_DIRECTORY, directory, f) for f in os.listdir(base_dir) if os.path.splitext(f)[1].lower() in (u'.jpg', u'.jpeg', u'.png')]
+        base_url = ''.join((
+                        smart_unicode(settings.MEDIA_URL),
+                        smart_unicode(settings.FILEBROWSER_DIRECTORY),
+                        smart_unicode(directory)))
+
+        base_dir = os.path.join(
+                    smart_unicode(settings.MEDIA_ROOT),
+                    smart_unicode(settings.FILEBROWSER_DIRECTORY),
+                    smart_unicode(directory))
+
+        def map_to_url(filename):
+            return "%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()
         images.sort()

-        return HttpResponse(json.dumps(images))
-    except (IndexError, OSError), e:
-        raise Http404
+        return JSONResponse(images)
+    except (IndexError, OSError), exc:
+        import traceback
+        traceback.print_exc()
+        raise http.Http404
+
+
+@never_cache
+def document_diff(request, name):
+    storage = getstorage()
+
+    revA = int(request.GET.get('from', 0))
+    revB = int(request.GET.get('to', 0))
+
+    if revA > revB:
+        revA, revB = revB, revA
+
+    if revB == 0:
+        revB = None
+
+    docA = storage.get_or_404(name, int(revA))
+    docB = storage.get_or_404(name, int(revB))
+
+    return http.HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(),
+                                         docB.plain_text.splitlines()))
+
+
+@never_cache
+def document_history(request, name):
+    storage = getstorage()
+    return JSONResponse(storage.history(name))
+
+
+@require_POST
+def document_add_tag(request, name):
+    storage = getstorage()
+
+    form = DocumentTagForm(request.POST)
+    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")})
+    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)})