Mostly Javascript refactoring.

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

diff --git a/apps/wiki/views.py b/apps/wiki/views.py
index 931cf78..c3fd6e3 100644 (file)
--- a/apps/wiki/views.py
+++ b/apps/wiki/views.py
@@ -5,13 +5,24 @@ from django.views.generic.simple import direct_to_template
 from django.http import HttpResponse, Http404
 from django.utils import simplejson as json
 
 from django.http import HttpResponse, Http404
 from django.utils import simplejson as json
 

-from wiki.models import storage, Document, DocumentNotFound
+from wiki.models import Document, DocumentNotFound, getstorage

 from wiki.forms import DocumentForm
 from datetime import datetime
 from wiki.forms import DocumentForm
 from datetime import datetime

+from django.utils.encoding import smart_unicode
+import wlapi

 
 

-# import google_diff
-import difflib
+#
+# 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

 
 class DateTimeEncoder(json.JSONEncoder):
      def default(self, obj):
 
 class DateTimeEncoder(json.JSONEncoder):
      def default(self, obj):


@@ -19,40 +30,76 @@ class DateTimeEncoder(json.JSONEncoder):
              return datetime.ctime(obj) + " " + (datetime.tzname(obj) or 'GMT')
          return json.JSONEncoder.default(self, obj)
 
              return datetime.ctime(obj) + " " + (datetime.tzname(obj) or 'GMT')
          return json.JSONEncoder.default(self, obj)
 

+@never_cache

 def document_list(request, template_name = 'wiki/document_list.html'):
 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 = {
     return direct_to_template(request, template_name, extra_context = {

-        'document_list': storage.all(),
-    })
-
+        'document_list': 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'):
 def document_detail(request, name, template_name = 'wiki/document_details.html'):

+    

     try:
     try:

-        document = storage.get(name)
-    except DocumentNotFound:
-        # WTF ?!
-        raise Http404 
-        # document = Document(storage, name = name, text = '')
+        document = getstorage().get(name)
+    except DocumentNotFound:        
+        raise Http404
+    
+    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,        
+    })

 
 

-    if request.method == 'POST':
+@never_cache
+def document_text(request, name):
+    try:
+        document = getstorage().get(name)
+    except DocumentNotFound:        
+        raise Http404
+    
+    if request.method == 'POST':        

         form = DocumentForm(request.POST, instance = document)
         if form.is_valid():
         form = DocumentForm(request.POST, instance = document)
         if form.is_valid():

-            document = form.save()
+            document = form.save(document_author = request.user.username)

             return HttpResponse(json.dumps({'text': document.plain_text, 'meta': document.meta(), 'revision': document.revision()}))
         else:
             return HttpResponse(json.dumps({'errors': form.errors}))
     else:
             return HttpResponse(json.dumps({'text': document.plain_text, 'meta': document.meta(), 'revision': document.revision()}))
         else:
             return HttpResponse(json.dumps({'errors': form.errors}))
     else:

-        form = DocumentForm(instance = document)
-
-    return direct_to_template(request, template_name, extra_context = {
-        'document': document,
-        'form': form,
-    })
+        return HttpResponse(json.dumps({'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_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%s/%s' % (
+                        smart_unicode(settings.MEDIA_URL),                         
+                        smart_unicode(settings.FILEBROWSER_DIRECTORY),
+                        smart_unicode(directory),
+                        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()
         return HttpResponse(json.dumps(images))
     except (IndexError, OSError), exc:
         images.sort()
         return HttpResponse(json.dumps(images))
     except (IndexError, OSError), exc:


@@ -61,16 +108,39 @@ def document_gallery(request, directory):
 
         raise Http404
     
 
         raise Http404
     

+@never_cache

 def document_diff(request, name, revA, revB):
 def document_diff(request, name, revA, revB):

-    differ = difflib.HtmlDiff(wrapcolumn=60)
-     
+    storage = getstorage()     

     docA = storage.get(name, int(revA))
     docA = storage.get(name, int(revA))

-    docB = storage.get(name, int(revB))
-     
-    return HttpResponse(differ.make_table(
-                                docA.plain_text.splitlines(),
-                                docB.plain_text.splitlines() ) )                                           
+    docB = storage.get(name, int(revB)) 
+    
+    
+    return HttpResponse(nice_diff.html_diff_table(docA.plain_text.splitlines(), 
+                                         docB.plain_text.splitlines()) )                                           

     
     

+@never_cache    
+def document_history(request, name):
+    storage = getstorage()
+    
+    return HttpResponse( 
+                json.dumps(storage.history(name), cls=DateTimeEncoder), 
+                mimetype='application/json')
+    
+    
+@never_cache
+def document_publish(request, name, version):
+    storage = getstorage()
+    
+    # get the document
+    try:
+        document = storage.get(name, revision = int(version))
+    except DocumentNotFound:        
+        raise Http404

     
     

-def document_history(reuqest, name):
-    return HttpResponse( json.dumps(storage.history(name), cls=DateTimeEncoder), mimetype='application/json')
+    api = wlapi.WLAPI(settings.WL_API_CONFIG)    
+    try:        
+        result = {"success": True, "result": api.publish_book(document)}
+    except wlapi.APICallException, e:                        
+        result = {"success": False, "reason": str(e)}
+        
+    return HttpResponse( json.dumps(result), mimetype='application/json')       
\ No newline at end of file