Fixed unicode commit messages in Revision.merge_with

[redakcja.git] / apps / explorer / views.py

diff --git a/apps/explorer/views.py b/apps/explorer/views.py
index 61d9a23..124a574 100644 (file)
--- a/apps/explorer/views.py
+++ b/apps/explorer/views.py
@@ -1,137 +1,160 @@
-from librarian import html
-import hg, urllib2, time
-from django.utils import simplejson as json
+# -*- coding: utf-8 -*-
+import urllib2
+import hg, re
+from datetime import date

 
 

-from django.views.generic.simple import direct_to_template
+import librarian
+
+from librarian import html, parser, dcparser
+from librarian import ParseError, ValidationError

 
 from django.conf import settings
 
 from django.conf import settings

-from django.http import HttpResponseRedirect, HttpResponse
+from django.contrib.auth.decorators import login_required, permission_required
+
+from django.core.urlresolvers import reverse
+from django.http import HttpResponseRedirect, HttpResponse, HttpResponseNotFound
+from django.utils import simplejson as json
+from django.views.generic.simple import direct_to_template

 from django.contrib.auth.decorators import login_required
 
 from explorer import forms, models
 from django.contrib.auth.decorators import login_required
 
 from explorer import forms, models

+from toolbar import models as toolbar_models

 
 

-repo = hg.Repository(settings.REPOSITORY_PATH)
-
-def file_list(request):
-    return direct_to_template(request, 'explorer/file_list.html', extra_context={
-        'objects': repo.all_files(),
-    })
+from django.forms.util import ErrorList

 
 

+import wlrepo

 
 #
 
 #

-# Edit the file
-#
-def file_xml(request, path):
-    if request.method == 'POST':
-        form = forms.BookForm(request.POST)
-        if form.is_valid():
-            print 'Saving whole text.', request.user.username
-            def save_action():
-                repo.add_file(path, form.cleaned_data['content'])
-                repo.commit(message='Local save at %s' % time.ctime(), user=request.user.username)
-
-            repo.in_branch('local_'+request.user.username, save_action);
-            result = "ok"
-        else:
-            result = "error"
+# Some useful decorators

 
 

-        errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() )
-        return HttpResponse( json.dumps({'result': result, 'errors': errors}) );
-    else:
-        form = forms.BookForm()
-        form.fields['content'].initial = repo.get_file(path).data()
+def file_branch(fileid, user=None):
+    parts = fileid.split('$')
+    return ('personal_'+ user.username + '_' if user is not None else '') \
+        + 'file_' + parts[0]

 
 

-    return direct_to_template(request, 'explorer/edit_text.html', extra_context={
-        'form': form,
-    })
-
-def file_dc(request, path):
-    if request.method == 'POST':
-        form = forms.DublinCoreForm(request.POST)
-        if form.is_valid():
-            form.save(repo, path)
-            result = "ok"
-        else:
-            result = "error" 
+def file_path(fileid):
+    return 'pub_'+fileid+'.xml'

 
 

-        errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() )
-        return HttpResponse( json.dumps({'result': result, 'errors': errors}) );
-    else:
-        fulltext = repo.get_file(path).data()
-        form = forms.DublinCoreForm(text=fulltext)       
+def with_repo(view):
+    """Open a repository for this view"""
+    def view_with_repo(request, *args, **kwargs):          
+        kwargs['repo'] = wlrepo.open_library(settings.REPOSITORY_PATH, 'hg')
+        return view(request, *args, **kwargs)
+    return view_with_repo

 
 

-    return direct_to_template(request, 'explorer/edit_dc.html', extra_context={
-        'form': form,
-        'fpath': path,
-    })
-
-# Display the main editor view
+#
+def ajax_login_required(view):
+    """Similar ro @login_required, but instead of redirect, 
+    just return some JSON stuff with error."""
+    def view_with_auth(request, *args, **kwargs):
+        if request.user.is_authenticated():
+            return view(request, *args, **kwargs)
+        # not authenticated
+        return HttpResponse( json.dumps({'result': 'access_denied', 'errors': ['Brak dostępu.']}) );
+    return view_with_auth
+
+@login_required
+# @with_repo

 def display_editor(request, path):
 def display_editor(request, path):

-    return direct_to_template(request, 'explorer/editor.html', extra_context={
-        'hash': path,
-    })
+    # this is the only entry point where we create an autobranch for the user
+    # if it doesn't exists. All other views SHOULD fail.
+    #def ensure_branch_exists():
+    #    parent = repo.get_branch_tip('default')
+    #    repo._create_branch(file_branch(path, request.user), parent)

 
 

-# ===============
-# = Panel views =
-# ===============
+#    try:
+    #    repo.with_wlock(ensure_branch_exists)

 
 

-def xmleditor_panel(request, path):
-    form = forms.BookForm()
-    text = repo.get_file(path).data()
-    
-    return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={
-        'fpath': path,
-        'text': text,
+    return direct_to_template(request, 'explorer/editor.html', extra_context={
+        'fileid': path,
+        'panel_list': ['lewy', 'prawy'],
+        'availble_panels': models.EditorPanel.objects.all(),
+        # 'scriptlets': toolbar_models.Scriptlet.objects.all()

     })
     
     })
     

+#
+# View all files
+#
+@with_repo
+def file_list(request, repo):   
+    import api.forms
+    from api.resources import library_resource

 
 

-def gallery_panel(request, path):
-    return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={
-        'fpath': path,
-        'form': forms.ImageFoldersForm(),
-    })
-
-
-def htmleditor_panel(request, path):
-    return direct_to_template(request, 'explorer/panels/htmleditor.html', extra_context={
-        'fpath': path,
-        'html': html.transform(repo.get_file(path).data(), is_file=False),
-    })
- 
-
-def dceditor_panel(request, path):
-    text = repo.get_file(path).data()
-    form = forms.DublinCoreForm(text=text)       
+    bookform = api.forms.DocumentUploadForm()

 
 

-    return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={
-        'fpath': path,
-        'form': form,
+    # short-circut the api document list
+    doctree = library_resource.handler.read(request)
+    # print "DOCTREE:", doctree['documents']
+        
+    return direct_to_template(request, 'explorer/file_list.html', extra_context={
+        'filetree': doctree['documents'], 'bookform': bookform,

     })
 
     })
 

+@permission_required('explorer.can_add_files')
+@with_repo
+def file_upload(request, repo):
+    from api.resources import library_resource
+    from api.forms import DocumentUploadForm
+    from django.http import HttpRequest, HttpResponseRedirect
+
+    response = library_resource.handler.create(request)
+
+    if isinstance(response, HttpResponse):
+        data = json.loads(response.content)
+        
+        if response.status_code == 201:
+            return HttpResponseRedirect( \
+                reverse("editor_view", args=[ data['name'] ]) )
+        else:
+            bookform = DocumentUploadForm(request.POST, request.FILES)
+            bookform.is_valid()
+            
+            return direct_to_template(request, 'explorer/file_upload.html',
+                extra_context={'bookform': bookform } )
+          
+
+@login_required
+def print_html(request, **kwargs):
+    from api.resources import document_html_resource
+
+    kwargs['stylesheet'] = 'legacy'
+    
+    output = document_html_resource.handler.read(request, **kwargs)

 
 

-# =================
-# = Utility views =
-# =================
-def folder_images(request, folder):
-    return direct_to_template(request, 'explorer/folder_images.html', extra_context={
-        'images': models.get_images_from_folder(folder),
-    })
+    if isinstance(output, HttpResponse):
+        # errors = json.loads(output.content)
+        output.mimetype = "text/plain"
+        return output
+    
+    return direct_to_template(request, 'html4print.html',
+        extra_context={'output': output, 'docid': kwargs['docid']},
+        mimetype="text/html" )

 
 
 def _add_references(message, issues):
     return message + " - " + ", ".join(map(lambda issue: "Refs #%d" % issue['id'], issues))
 
 
 
 def _add_references(message, issues):
     return message + " - " + ", ".join(map(lambda issue: "Refs #%d" % issue['id'], issues))
 

-def _get_issues_for_file(path):
-    if not path.endswith('.xml'):
-        raise ValueError('Path must end with .xml')
-
-    book_id = path[:-4]
+def _get_issues_for_file(fileid):

     uf = None
     uf = None

-

     try:
     try:

-        uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/issues/%s.json' % book_id)
+        uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/issues/%s.json' % fileid)

         return json.loads(uf.read())
     except urllib2.HTTPError:
         return []
     finally:
         if uf: uf.close()
         return json.loads(uf.read())
     except urllib2.HTTPError:
         return []
     finally:
         if uf: uf.close()

+
+# =================
+# = Pull requests =
+# =================
+def pull_requests(request):
+    from explorer.models import PullRequest
+
+    objects = PullRequest.objects.order_by('status')
+
+    if not request.user.has_perm('explorer.book.can_share'):
+        objects = objects.filter(comitter=request.user)
+
+    
+    return direct_to_template(request, 'manager/pull_request.html', 
+        extra_context = {'objects': objects} )