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
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():
+ documents[docid] = {
+ 'url': reverse('document_view', args=[docid]),
+ 'name': docid,
+ 'parts': []
+ }
- return {'documents' : document_list }
+ 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
try:
lock = lib.lock()
try:
+ print "DOCID", docid
doc = lib.document_create(docid)
# document created, but no content yet
result = {
'name': udoc.id,
- 'html_url': reverse('dochtml_view', args=[doc.id,doc.revision]),
- 'text_url': reverse('doctext_view', args=[doc.id,doc.revision]),
- 'dc_url': reverse('docdc_view', args=[doc.id,doc.revision]),
+ '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]),
'user_revision': udoc.revision,
'public_revision': doc.revision,
}
#
#
#
-
class DocumentHTMLHandler(BaseHandler):
allowed_methods = ('GET', 'PUT')
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<link>[^\1]+?)\1\s*[^>]*?>"""
+#
+#
class DocumentTextHandler(BaseHandler):
allowed_methods = ('GET', 'PUT')
"provided_revision": orig.revision,
"latest_revision": current.revision })
- ndoc = doc.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 []) ]
- # return the new revision number
- return {
- "document": ndoc.id,
- "subview": "xml",
- "previous_revision": prev,
- "updated_revision": ndoc.revision
- }
-
- except (RevisionNotFound, KeyError):
- return response.EntityNotFound().django_response()
+ # 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
+ return {
+ "document": ndoc.id,
+ "subview": "xml",
+ "previous_revision": current.revision,
+ "updated_revision": ndoc.revision
+ }
+ except Exception, e:
+ lib._rollback()
+ raise e
+ except RevisionNotFound, e:
+ return response.EntityNotFound().django_response(e)
#
# Dublin Core handlers
"""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()
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
+ }
+ except Exception, e:
+ 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"""
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.
# 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:
fnp / redakcja.git / blobdiff