X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/020ad779bc86249cd11cb8aa4970420b16789f55..8c26f548ef22db734120de4a0828aa8d6b9fdaa0:/apps/api/handlers/library_handlers.py diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py index 2b1edb21..9751fefb 100644 --- a/apps/api/handlers/library_handlers.py +++ b/apps/api/handlers/library_handlers.py @@ -9,6 +9,7 @@ __date__ = "$2009-09-25 15:49:50$" __doc__ = "Module documentation." from piston.handler import BaseHandler, AnonymousBaseHandler +from django.http import HttpResponse import re from datetime import date @@ -19,6 +20,7 @@ from django.db import IntegrityError import librarian import librarian.html +import difflib from librarian import dcparser, parser from wlrepo import * @@ -29,7 +31,7 @@ from explorer.models import GalleryForDocument import api.forms as forms import api.response as response from api.utils import validate_form, hglibrary, natural_order -from api.models import PartCache +from api.models import PartCache, PullRequest # import settings @@ -38,18 +40,24 @@ import settings def is_prq(username): return username.startswith('$prq-') +def prq_for_user(username): + try: + return PullRequest.objects.get(id=int(username[5:])) + except: + return None + def check_user(request, user): log.info("user: %r, perm: %r" % (request.user, request.user.get_all_permissions()) ) #pull request if is_prq(user): - if not request.user.has_perm('api.pullrequest.can_view'): + if not request.user.has_perm('api.view_prq'): yield response.AccessDenied().django_response({ 'reason': 'access-denied', 'message': "You don't have enough priviliges to view pull requests." }) # other users elif request.user.username != user: - if not request.user.has_perm('api.document.can_view_other'): + if not request.user.has_perm('api.view_other_document'): yield response.AccessDenied().django_response({ 'reason': 'access-denied', 'message': "You don't have enough priviliges to view other people's document." @@ -140,7 +148,6 @@ class LibraryHandler(BaseHandler): log.info("DOCID %s", 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) @@ -195,6 +202,26 @@ class BasicDocumentHandler(AnonymousBaseHandler): return result + +class DiffHandler(BaseHandler): + allowed_methods = ('GET',) + + @hglibrary + def read(self, request, source_revision, target_revision, lib): + '''Return diff between source_revision and target_revision)''' + source_document = lib.document_for_rev(source_revision) + target_document = lib.document_for_rev(target_revision) + print source_document, + print target_document + diff = difflib.unified_diff( + source_document.data('xml').splitlines(True), + target_document.data('xml').splitlines(True), + 'source', + 'target') + + return ''.join(list(diff)) + + # # Document Meta Data # @@ -229,28 +256,28 @@ class DocumentHandler(BaseHandler): # the user doesn't have this document checked out # or some other weird error occured # try to do the checkout - if is_prq(user) or (user == request.user.username): - try: + try: + if user == request.user.username: mdoc = lib.document(docid) doc = mdoc.take(user) - - if is_prq(user): - # source revision, should probably change - # but there are no changes yet, so... - pass - - except RevisionNotFound, e: + elif is_prq(user): + prq = prq_for_user(user) + # commiter's document + prq_doc = lib.document_for_rev(prq.source_revision) + doc = prq_doc.take(user) + else: return response.EntityNotFound().django_response({ 'reason': 'document-not-found', 'message': e.message, - 'docid': docid + 'docid': docid, + 'user': user, }) - else: + except RevisionNotFound, e: return response.EntityNotFound().django_response({ 'reason': 'document-not-found', 'message': e.message, 'docid': docid, - 'user': user, + 'user': user }) return { @@ -337,7 +364,7 @@ class DocumentGalleryHandler(BaseHandler): gallery = {'name': assoc.name, 'pages': []} - for file in sorted(os.listdir(dirpath)): + for file in os.listdir(dirpath): if not isinstance(file, unicode): try: file = file.decode('utf-8') @@ -363,7 +390,7 @@ class DocumentGalleryHandler(BaseHandler): # gallery['pages'].sort() galleries.append(gallery) - return galleries + return galleries # # Document Text View @@ -623,11 +650,7 @@ class MergeHandler(BaseHandler): if form.cleaned_data['type'] == 'update': # update is always performed from the file branch # to the user branch - changed, clean = base_doc.update(request.user.username) - - # update user document - if changed: - user_doc_new = user_doc.latest() + user_doc_new = base_doc.update(request.user.username) # shared document is the same doc_new = doc @@ -646,7 +669,7 @@ class MergeHandler(BaseHandler): "message": "There are unresolved conflicts in your file. Fix them, and try again." }) - if not request.user.has_perm('api.document.can_share'): + if not request.user.has_perm('api.share_document'): # User is not permitted to make a merge, right away # So we instead create a pull request in the database try: @@ -680,6 +703,8 @@ class MergeHandler(BaseHandler): # update shared version if needed if changed: doc_new = doc.latest() + else: + doc_new = doc # the user wersion is the same user_doc_new = base_doc @@ -695,8 +720,8 @@ class MergeHandler(BaseHandler): "revision": user_doc_new.revision, 'timestamp': user_doc_new.revision.timestamp, - "parent_revision": user_doc_new.revision, - "parent_timestamp": user_doc_new.revision.timestamp, + "parent_revision": user_doc.revision, + "parent_timestamp": user_doc.revision.timestamp, "shared_revision": doc_new.revision, "shared_timestamp": doc_new.revision.timestamp,