From: Łukasz Rekucki Date: Sun, 27 Sep 2009 00:44:16 +0000 (+0200) Subject: Document index displayed as a tree, not list. X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/d9504c2a3128f75281f20f7e37822bf72f64f897?ds=sidebyside Document index displayed as a tree, not list. --- diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index 0ad23d9f..ae61389a 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,36 @@ 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() ] - - return {'documents' : document_list } + documents = {} + + for docid in lib.documents(): + documents[docid] = { + 'url': reverse('document_view', args=[docid]), + 'name': docid, + 'parts': [] + } + + related = PartCache.objects.defer('part_id')\ + .values_list('part_id', 'document_id').distinct() + + for part, docid in related: + # this way, we won't display broken links + if not documents.has_key(part): + continue + + child = documents[part] + parent = documents[docid] + + if isinstance(parent, dict): # the parent is top-level + documents.pop(part) + parent['parts'].append(child) + documents[part] = child['parts'] + else: # not top-level + parent.append(child) + + return { + 'documents': [d for d in documents.itervalues() if isinstance(d, dict)] + } @validate_form(forms.DocumentUploadForm, 'POST') @hglibrary @@ -160,7 +188,6 @@ class DocumentHandler(BaseHandler): # # # - class DocumentHTMLHandler(BaseHandler): allowed_methods = ('GET', 'PUT') @@ -177,9 +204,16 @@ class DocumentHTMLHandler(BaseHandler): 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') @@ -216,7 +250,35 @@ 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 []) ] + + # 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() + + # 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) + f.close() + + ndoc = current.invoke_and_commit(\ + xml_update_action, lambda d: (msg, current.owner) ) try: # return the new revision number @@ -294,6 +356,8 @@ class DocumentDublinCoreHandler(BaseHandler): except RevisionNotFound: return response.EntityNotFound().django_response() + + class MergeHandler(BaseHandler): allowed_methods = ('POST',) @@ -351,12 +415,12 @@ class MergeHandler(BaseHandler): 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: diff --git a/apps/api/models.py b/apps/api/models.py index 71a83623..c08f38db 100644 --- a/apps/api/models.py +++ b/apps/api/models.py @@ -1,3 +1,30 @@ from django.db import models # Create your models here. +class PartCache(models.Model): + document_id = models.CharField(max_length=255) + user_id = models.CharField(max_length=64, blank=True) + part_id = models.CharField(max_length=255) + + @classmethod + def update_cache(me, docid, userid, old, new): + old = set(old) + new = set(new) + + related = me.objects.filter(user_id=userid, document_id=docid) + + missing = old.difference(new) + related.filter(part_id__in=missing).delete() + + created = new.difference(old) + + for part in created: + me.objects.create(user_id=userid, document_id=docid, part_id=part) + + + + + + + + \ No newline at end of file diff --git a/apps/api/tests/__init__.py b/apps/api/tests/__init__.py index 72b41326..f28b3b2f 100644 --- a/apps/api/tests/__init__.py +++ b/apps/api/tests/__init__.py @@ -104,8 +104,8 @@ class SimpleTest(TestCase): self.assert_json_response({ # u'latest_rev': u'f94a263812dbe46a3a13d5209bb119988d0078d5', u'documents': [ - {u'url': u'/api/documents/sample', u'name': u'sample'}, - {u'url': u'/api/documents/sample_pl', u'name': u'sample_pl'} + {u'url': u'/api/documents/sample', u'name': u'sample', u'parts': []}, + {u'url': u'/api/documents/sample_pl', u'name': u'sample_pl', u'parts': []} ], }) diff --git a/apps/explorer/models.py b/apps/explorer/models.py index 6d8cd8e0..48d0247d 100644 --- a/apps/explorer/models.py +++ b/apps/explorer/models.py @@ -62,9 +62,7 @@ class Book(models.Model): abstract=True pass - -class PullRequest(models.Model): - +class PullRequest(models.Model): REQUEST_STATUSES = ( ("N", "Pending for resolution"), ("R", "Rejected"), diff --git a/lib/wlrepo/mercurial_backend/__init__.py b/lib/wlrepo/mercurial_backend/__init__.py index c1d3d30f..2d0ce828 100644 --- a/lib/wlrepo/mercurial_backend/__init__.py +++ b/lib/wlrepo/mercurial_backend/__init__.py @@ -5,6 +5,7 @@ __date__ = "$2009-09-25 09:20:22$" __doc__ = "Module documentation." import wlrepo +from mercurial.node import nullid class MercurialRevision(wlrepo.Revision): @@ -65,11 +66,11 @@ class MercurialRevision(wlrepo.Revision): return (a.branch() == self._changectx.branch()) def merge_with(self, other, user, message): - lock = self._library._lock(True) + lock = self._library.lock(True) try: self._library._checkout(self._changectx.node()) status = self._library._merge(other._changectx.node()) - if status.is_clean(): + if status.isclean(): self._library._commit(user=user, message=message) return (True, True) else: diff --git a/lib/wlrepo/mercurial_backend/document.py b/lib/wlrepo/mercurial_backend/document.py index 523e330a..51a2014c 100644 --- a/lib/wlrepo/mercurial_backend/document.py +++ b/lib/wlrepo/mercurial_backend/document.py @@ -35,7 +35,7 @@ class MercurialDocument(wlrepo.Document): return self.invoke_and_commit(write, lambda d: (msg, self.owner)) def invoke_and_commit(self, ops, - before_commit, rollback=False): + commit_info): lock = self._library.lock() try: self._library._checkout(self._revision.hgrev()) @@ -44,7 +44,7 @@ class MercurialDocument(wlrepo.Document): return self.id + '.' + entry ops(self._library, entry_path) - message, user = before_commit(self) + message, user = commit_info(self) self._library._commit(message, user) try: return self._library.document(docid=self.id, user=user) @@ -60,7 +60,7 @@ class MercurialDocument(wlrepo.Document): # self.invoke_and_commit(message, user, lambda *a: True) def ismain(self): - return self._revision.user_name() is None + return self._revision.user_name is None def shared(self): if self.ismain(): @@ -111,7 +111,7 @@ class MercurialDocument(wlrepo.Document): if self.ismain(): return (True, False) # always shared - user = self._revision.user_name() + user = self._revision.user_name main = self.shared()._revision local = self._revision