X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/d6c4fb901ad64f828287556a26daab52449dab32..f7e3ba3851d4ec6e3decaab0d568e492726224dc:/apps/wiki/views.py?ds=sidebyside diff --git a/apps/wiki/views.py b/apps/wiki/views.py index 21c9fe5b..c3fd6e38 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -5,13 +5,20 @@ from django.views.generic.simple import direct_to_template 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 django.utils.encoding import smart_unicode +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 httplib2 -import poster import nice_diff import operator @@ -23,19 +30,20 @@ class DateTimeEncoder(json.JSONEncoder): 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'): # TODO: find a way to cache "Storage All" 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'): - print "Trying to get", repr(name) + try: - document = storage.get(name) + document = getstorage().get(name) except DocumentNotFound: raise Http404 @@ -46,8 +54,19 @@ def document_detail(request, name, template_name = 'wiki/document_details.html') 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 - + request.session['wiki_last_docs'] = last_documents + + return direct_to_template(request, template_name, extra_context = { + 'document': document, + }) + +@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(): @@ -56,14 +75,11 @@ def document_detail(request, name, template_name = 'wiki/document_details.html') 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: base_dir = os.path.join( @@ -92,7 +108,9 @@ def document_gallery(request, directory): raise Http404 -def document_diff(request, name, revA, revB): +@never_cache +def document_diff(request, name, revA, revB): + storage = getstorage() docA = storage.get(name, int(revA)) docB = storage.get(name, int(revB)) @@ -100,42 +118,29 @@ def document_diff(request, name, revA, 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 - poster.streaminghttp.register_openers() - - # send request to WL - http = httplib2.Http() - http.add_credentials("test", "test") - http.follow_all_redirects = True - datagen, headers = poster.encode.multipart_encode({name: document.plain_text}) - - for key, value in headers.items(): - headers[key] = unicode(value) - - try: - resp, data = http.request("http://localhost:8000/api/books.json", - method = "POST", body = ''.join(datagen), headers = headers) - - print resp, data - - if resp.status == 201: # success - result = {"success": True} - else: - result = {"success": False, "errno": resp.status, "reason": resp.reason} - except Exception, e: - result = {"success": False, "errno": 500, "reason": unicode(e)} + 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