X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/eb77cf373a37d609fcf39626c36d2878d4a60e6c..826d67400c317836cd9dd02bb03b39a390e4514b:/apps/api/handlers/library_handlers.py?ds=sidebyside diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index 5f844dba..d2c6ec32 100644 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@ -6,21 +6,24 @@ __doc__ = "Module documentation." from piston.handler import BaseHandler, AnonymousBaseHandler - -import librarian -import librarian.html -import api.forms as forms +import re from datetime import date from django.core.urlresolvers import reverse +from django.utils import simplejson as json -from wlrepo import RevisionNotFound, LibraryException, DocumentAlreadyExists +import librarian +import librarian.html from librarian import dcparser +from wlrepo import RevisionNotFound, LibraryException, DocumentAlreadyExists +from explorer.models import PullRequest + +# internal imports +import api.forms as forms import api.response as response from api.utils import validate_form, hglibrary - -from explorer.models import PullRequest +from api.models import PartCache # # Document List Handlers @@ -46,11 +49,35 @@ class LibraryHandler(BaseHandler): def read(self, request, lib): """Return the list of documents.""" - document_list = [{ - 'url': reverse('document_view', args=[docid]), - 'name': docid } for docid in lib.documents() ] + documents = {} + + for docid in lib.documents(): + docid = docid.decode('utf-8') + documents[docid] = { + 'url': reverse('document_view', args=[docid]), + 'name': docid, + 'parts': [] + } + + parts = PartCache.objects.defer('part_id')\ + .values_list('part_id', 'document_id').distinct() + + document_tree = dict(documents) - return {'documents' : document_list } + for part, docid in parts: + # this way, we won't display broken links + if not documents.has_key(part): + print "NOT FOUND:", part + continue + + parent = documents[docid] + child = documents[part] + + # not top-level anymore + document_tree.pop(part) + parent['parts'].append(child) + + return {'documents': sorted(document_tree.values()) } @validate_form(forms.DocumentUploadForm, 'POST') @hglibrary @@ -70,6 +97,7 @@ class LibraryHandler(BaseHandler): try: lock = lib.lock() try: + print "DOCID", docid doc = lib.document_create(docid) # document created, but no content yet @@ -146,6 +174,7 @@ class DocumentHandler(BaseHandler): 'html_url': reverse('dochtml_view', args=[udoc.id,udoc.revision]), 'text_url': reverse('doctext_view', args=[udoc.id,udoc.revision]), 'dc_url': reverse('docdc_view', args=[udoc.id,udoc.revision]), + #'gallery_url': reverse('docdc_view', args=[udoc.id,udoc.revision]), 'user_revision': udoc.revision, 'public_revision': doc.revision, } @@ -159,7 +188,6 @@ class DocumentHandler(BaseHandler): # # # - class DocumentHTMLHandler(BaseHandler): allowed_methods = ('GET', 'PUT') @@ -172,13 +200,18 @@ class DocumentHTMLHandler(BaseHandler): else: document = lib.document_for_rev(revision) - return librarian.html.transform(document.data('xml')) + return librarian.html.transform(document.data('xml'), is_file=False) except RevisionNotFound: return response.EntityNotFound().django_response() # # Document Text View # + +XINCLUDE_REGEXP = r"""<(?:\w+:)?include\s+[^>]*?href=("|')wlrepo://(?P[^\1]+?)\1\s*[^>]*?>""" +# +# +# class DocumentTextHandler(BaseHandler): allowed_methods = ('GET', 'PUT') @@ -215,22 +248,57 @@ class DocumentTextHandler(BaseHandler): "provided_revision": orig.revision, "latest_revision": current.revision }) - ndoc = current.quickwrite('xml', data, msg) + # try to find any Xinclude tags + includes = [m.groupdict()['link'] for m in (re.finditer(\ + XINCLUDE_REGEXP, data, flags=re.UNICODE) or []) ] + + print "INCLUDES: ", includes + + # TODO: provide useful routines to make this simpler + def xml_update_action(lib, resolve): + try: + f = lib._fileopen(resolve('parts'), 'r') + stored_includes = json.loads(f.read()) + f.close() + except: + stored_includes = [] + + if stored_includes != includes: + f = lib._fileopen(resolve('parts'), 'w+') + f.write(json.dumps(includes)) + f.close() + + lib._fileadd(resolve('parts')) + + # update the parts cache + PartCache.update_cache(docid, current.owner,\ + stored_includes, includes) + + # now that the parts are ok, write xml + f = lib._fileopen(resolve('xml'), 'w+') + f.write(data.encode('utf-8')) + f.close() + + ndoc = None + ndoc = current.invoke_and_commit(\ + xml_update_action, lambda d: (msg, current.owner) ) try: # return the new revision number - return { + return response.SuccessAllOk().django_response({ "document": ndoc.id, "subview": "xml", "previous_revision": current.revision, - "updated_revision": ndoc.revision - } + "updated_revision": ndoc.revision, + "url": reverse("doctext_view", args=[ndoc.id, ndoc.revision]) + }) except Exception, e: - lib.rollback() - raise e - - except (RevisionNotFound, KeyError): - return response.EntityNotFound().django_response() + if ndoc: lib._rollback() + raise e + except RevisionNotFound, e: + return response.EntityNotFound(mimetype="text/plain").\ + django_response(e.message) + # # Dublin Core handlers @@ -245,9 +313,9 @@ class DocumentDublinCoreHandler(BaseHandler): """Read document as raw text""" try: if revision == 'latest': - document = lib.document(docid) + doc = lib.document(docid) else: - document = lib.document_for_rev(revision) + doc = lib.document_for_rev(revision) bookinfo = dcparser.BookInfo.from_string(doc.data('xml')) return bookinfo.serialize() @@ -280,20 +348,25 @@ class DocumentDublinCoreHandler(BaseHandler): document.serialize().encode('utf-8'),\ message=msg, user=request.user.username) - return { - "document": ndoc.id, - "subview": "xml", - "previous_revision": prev, - "updated_revision": ndoc.revision - } - except (RevisionNotFound, KeyError): + try: + # return the new revision number + return { + "document": ndoc.id, + "subview": "dc", + "previous_revision": current.revision, + "updated_revision": ndoc.revision, + "url": reverse("docdc_view", args=[ndoc.id, ndoc.revision]) + } + except Exception, e: + if ndoc: lib._rollback() + raise e + except RevisionNotFound: return response.EntityNotFound().django_response() - class MergeHandler(BaseHandler): allowed_methods = ('POST',) - @validate_form(forms.MergeRequestForm) + @validate_form(forms.MergeRequestForm, 'POST') @hglibrary def create(self, request, form, docid, lib): """Create a new document revision from the information provided by user""" @@ -306,7 +379,7 @@ class MergeHandler(BaseHandler): if target_rev == 'latest': target_rev = udoc.revision - if udoc.revision != target_rev: + if str(udoc.revision) != target_rev: # user think doesn't know he has an old version # of his own branch. @@ -328,29 +401,31 @@ class MergeHandler(BaseHandler): # update his internal state. return response.EntityConflict().django_response({ "reason": "out-of-date", - "provided": target_revision, + "provided": target_rev, "latest": udoc.revision }) - if not request.user.has_permission('explorer.pull_request.can_add'): + if not request.user.has_perm('explorer.book.can_share'): # User is not permitted to make a merge, right away # So we instead create a pull request in the database prq = PullRequest( - commiter=request.uset.username, + comitter=request.user, document=docid, - source_revision = udoc.revision, + source_revision = str(udoc.revision), status="N", - comment = form.cleaned_data['comment'] + comment = form.cleaned_data['comment'] or '$AUTO$ Document shared.' ) prq.save() - return response.RequestAccepted() + return response.RequestAccepted().django_response(\ + ticket_status=prq.status, \ + ticket_uri=reverse("pullrequest_view", args=[prq.id]) ) - if form.cleanded_data['type'] == 'update': + if form.cleaned_data['type'] == 'update': # update is always performed from the file branch # to the user branch success, changed = udoc.update(request.user.username) - if form.cleanded_data['type'] == 'share': + if form.cleaned_data['type'] == 'share': success, changed = udoc.share(form.cleaned_data['comment']) if not success: @@ -366,4 +441,4 @@ class MergeHandler(BaseHandler): "parent_user_resivion": udoc.revision, "parent_revision": doc.revision, "revision": udoc.revision, - }) \ No newline at end of file + })