from django.core.urlresolvers import reverse
-from wlrepo import RevisionNotFound, DocumentAlreadyExists
+from wlrepo import RevisionNotFound, LibraryException, DocumentAlreadyExists
from librarian import dcparser
import api.response as response
from api.utils import validate_form, hglibrary
+from explorer.models import PullRequest
+
#
# Document List Handlers
#
"""Create a new document."""
if form.cleaned_data['ocr_data']:
- data = form.cleaned_data['ocr_data'].encode('utf-8')
+ data = form.cleaned_data['ocr_data']
else:
data = request.FILES['ocr_file'].read().decode('utf-8')
data = librarian.wrap_text(data, unicode(date.today()))
docid = form.cleaned_data['bookname']
+
try:
- doc = lib.document_create(docid)
- doc = doc.quickwrite('xml', data, '$AUTO$ XML data uploaded.',
- user=request.user.username)
-
- url = reverse('document_view', args=[doc.id])
-
- return response.EntityCreated().django_response(\
- body = {
- 'url': url,
- 'name': doc.id,
- 'revision': doc.revision },
- url = url )
+ lock = lib.lock()
+ try:
+ print "DOCID", docid
+ doc = lib.document_create(docid)
+ # document created, but no content yet
+
+ try:
+ doc = doc.quickwrite('xml', data.encode('utf-8'),
+ '$AUTO$ XML data uploaded.', user=request.user.username)
+ except Exception,e:
+ # rollback branch creation
+ lib._rollback()
+ raise LibraryException("Exception occured:" + repr(e))
+
+ url = reverse('document_view', args=[doc.id])
+
+ return response.EntityCreated().django_response(\
+ body = {
+ 'url': url,
+ 'name': doc.id,
+ 'revision': doc.revision },
+ url = url )
+ finally:
+ lock.release()
+ except LibraryException, e:
+ return response.InternalError().django_response(\
+ {'exception': repr(e) })
except DocumentAlreadyExists:
# Document is already there
return response.EntityConflict().django_response(\
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,
}
"provided_revision": orig.revision,
"latest_revision": current.revision })
- ndoc = doc.quickwrite('xml', data, msg)
-
- # 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()
+ ndoc = current.quickwrite('xml', data, msg)
+
+ 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"""
- pass
+ target_rev = form.cleaned_data['target_revision']
-
-
-
+ doc = lib.document(docid)
+ udoc = doc.take(request.user.username)
+
+ if target_rev == 'latest':
+ target_rev = udoc.revision
+
+ if str(udoc.revision) != target_rev:
+ # user think doesn't know he has an old version
+ # of his own branch.
+
+ # Updating is teorericly ok, but we need would
+ # have to force a refresh. Sharing may be not safe,
+ # 'cause it doesn't always result in update.
+
+ # In other words, we can't lie about the resource's state
+ # So we should just yield and 'out-of-date' conflict
+ # and let the client ask again with updated info.
+
+ # NOTE: this could result in a race condition, when there
+ # are 2 instances of the same user editing the same document.
+ # Instance "A" trying to update, and instance "B" always changing
+ # the document right before "A". The anwser to this problem is
+ # for the "A" to request a merge from 'latest' and then
+ # check the parent revisions in response, if he actually
+ # merge from where he thinks he should. If not, the client SHOULD
+ # update his internal state.
+ return response.EntityConflict().django_response({
+ "reason": "out-of-date",
+ "provided": target_rev,
+ "latest": udoc.revision })
+
+ 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(
+ comitter=request.user,
+ document=docid,
+ source_revision = str(udoc.revision),
+ status="N",
+ comment = form.cleaned_data['comment'] or '$AUTO$ Document shared.'
+ )
+
+ prq.save()
+ return response.RequestAccepted().django_response(\
+ ticket_status=prq.status, \
+ ticket_uri=reverse("pullrequest_view", args=[prq.id]) )
+
+ if form.cleanded_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':
+ success, changed = udoc.share(form.cleaned_data['comment'])
+
+ if not success:
+ return response.EntityConflict().django_response()
+
+ if not changed:
+ return response.SuccessNoContent().django_response()
+
+ new_udoc = udoc.latest()
+
+ return response.SuccessAllOk().django_response({
+ "name": udoc.id,
+ "parent_user_resivion": udoc.revision,
+ "parent_revision": doc.revision,
+ "revision": udoc.revision,
+ })
\ No newline at end of file
fnp / redakcja.git / blobdiff