X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/07edfacbb61a558c8760b20591b2f2723034e414..f7e3ba3851d4ec6e3decaab0d568e492726224dc:/apps/wiki/views.py?ds=sidebyside diff --git a/apps/wiki/views.py b/apps/wiki/views.py index a2de0a05..c3fd6e38 100644 --- a/apps/wiki/views.py +++ b/apps/wiki/views.py @@ -5,10 +5,11 @@ 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 @@ -33,16 +34,16 @@ class DateTimeEncoder(json.JSONEncoder): 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 @@ -53,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(): @@ -63,12 +75,8 @@ 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 @@ -101,7 +109,8 @@ def document_gallery(request, directory): raise Http404 @never_cache -def document_diff(request, name, revA, revB): +def document_diff(request, name, revA, revB): + storage = getstorage() docA = storage.get(name, int(revA)) docB = storage.get(name, int(revB)) @@ -111,40 +120,27 @@ def document_diff(request, name, revA, revB): @never_cache def document_history(request, name): + storage = getstorage() + return HttpResponse( json.dumps(storage.history(name), cls=DateTimeEncoder), mimetype='application/json') -import urllib, urllib2 - @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 - auth_handler = urllib2.HTTPDigestAuthHandler(); - auth_handler.add_password( - realm="localhost:8000", - uri="http://localhost:8000/api/", - user="test", passwd="test") - - - opener = urllib2.build_opener(auth_handler) - rq = urllib2.Request("http://localhost:8000/api/books.json") - rq.add_data(json.dumps({"text": document.text, "compressed": False})) - rq.add_header("Content-Type", "application/json") - - try: - response = opener.open(rq) - result = {"success": True, "message": response.read()} - except urllib2.HTTPError, e: - logger.exception("Failed to send") - if e.code == 500: - return HttpResponse(e.read(), mimetype='text/plain') - result = {"success": False, "reason": e.read(), "errno": e.code} + 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