X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/94ecd7a5d671af98be2ec7cf33605ae4d42c251a..1d07e208b0897af64f71755c974762bc7cd19ca0:/apps/explorer/views.py?ds=inline diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 7121e35f..7a42b432 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -1,26 +1,44 @@ +# -*- coding: utf-8 -*- import urllib2 -import hg -from lxml import etree -from librarian import html,dcparser +import hg, re +from datetime import date + +import librarian + +from librarian import html, parser, dcparser +from librarian import ParseError, ValidationError from django.conf import settings from django.contrib.auth.decorators import login_required, permission_required -from django.core.paginator import Paginator, InvalidPage, EmptyPage + from django.core.urlresolvers import reverse -from django.http import HttpResponseRedirect, HttpResponse +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 toolbar import models as toolbar_models + +from django.forms.util import ErrorList +import wlrepo # # Some useful decorators -# + +def file_branch(fileid, user=None): + parts = fileid.split('$') + return ('personal_'+ user.username + '_' if user is not None else '') \ + + 'file_' + parts[0] + +def file_path(fileid): + return 'pub_'+fileid+'.xml' + def with_repo(view): """Open a repository for this view""" def view_with_repo(request, *args, **kwargs): - kwargs['repo'] = hg.Repository(settings.REPOSITORY_PATH) + kwargs['repo'] = wlrepo.open_library(settings.REPOSITORY_PATH, 'hg') return view(request, *args, **kwargs) return view_with_repo @@ -32,201 +50,101 @@ def ajax_login_required(view): if request.user.is_authenticated(): return view(request, *args, **kwargs) # not authenticated - return HttpResponse( json.dumps({'result': 'access_denied'}) ); + return HttpResponse( json.dumps({'result': 'access_denied', 'errors': ['Brak dostępu.']}) ); return view_with_auth +@login_required +# @with_repo +def display_editor(request, 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) + +# try: + # repo.with_wlock(ensure_branch_exists) + + 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): - paginator = Paginator( repo.file_list('default'), 100); - bookform = forms.BookUploadForm() - - try: - page = int(request.GET.get('page', '1')) - except ValueError: - page = 1 +def file_list(request, repo): + import api.forms + from api.resources import library_resource - try: - files = paginator.page(page) - except (EmptyPage, InvalidPage): - files = paginator.page(paginator.num_pages) + bookform = api.forms.DocumentUploadForm() + # 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={ - 'files': files, 'page': page, 'bookform': bookform, + 'filetree': doctree['documents'], 'bookform': bookform, }) @permission_required('explorer.can_add_files') @with_repo def file_upload(request, repo): - form = forms.BookUploadForm(request.POST, request.FILES) - if form.is_valid(): - f = request.FILES['file'] - - def upload_action(): - print 'Adding file: %s' % f.name - repo._add_file(f.name, f.read().decode('utf-8')) - repo._commit(message="File %s uploaded from platform by %s" % - (f.name, request.user.username), user=request.user.username) - - repo.in_branch(upload_action, 'default') - return HttpResponseRedirect( reverse('editor_view', kwargs={'path': f.name}) ) - - return direct_to_template(request, 'explorer/file_upload.html', - extra_context = {'form' : form} ) - -# -# Edit the file -# + from api.resources import library_resource + from api.forms import DocumentUploadForm + from django.http import HttpRequest, HttpResponseRedirect -@ajax_login_required -@with_repo -def file_xml(request, repo, path): - if request.method == 'POST': - form = forms.BookForm(request.POST) - if form.is_valid(): - print 'Saving whole text.', request.user.username - def save_action(): - print 'In branch: ' + repo.repo[None].branch() - repo._add_file(path, form.cleaned_data['content']) - repo._commit(message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), user=request.user.username) - - print repo.in_branch(save_action, models.user_branch(request.user) ); - result = "ok" - else: - result = "error" - - errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() ) - return HttpResponse( json.dumps({'result': result, 'errors': errors}) ); + response = library_resource.handler.create(request) - form = forms.BookForm() - data = repo.get_file(path, models.user_branch(request.user)) - form.fields['content'].initial = data - return HttpResponse( json.dumps({'result': 'ok', 'content': data}) ) - -@ajax_login_required -@with_repo -def file_dc(request, path, repo): - if request.method == 'POST': - form = forms.DublinCoreForm(request.POST) + if isinstance(response, HttpResponse): + data = json.loads(response.content) - if form.is_valid(): - def save_action(): - file_contents = repo._get_file(path) - doc = etree.fromstring(file_contents) - - book_info = dcparser.BookInfo() - for name, value in form.cleaned_data.items(): - if value is not None and value != '': - setattr(book_info, name, value) - rdf = etree.XML(book_info.to_xml()) - - old_rdf = doc.getroottree().find('//{http://www.w3.org/1999/02/22-rdf-syntax-ns#}RDF') - old_rdf.getparent().remove(old_rdf) - doc.insert(0, rdf) - repo._add_file(path, etree.tostring(doc, pretty_print=True, encoding=unicode)) - repo._commit(message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), user=request.user.username) - - repo.in_branch(save_action, models.user_branch(request.user) ) - - result = "ok" + if response.status_code == 201: + return HttpResponseRedirect( \ + reverse("editor_view", args=[ data['name'] ]) ) else: - result = "error" - - errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() ) - return HttpResponse( json.dumps({'result': result, 'errors': errors}) ); - - fulltext = repo.get_file(path, models.user_branch(request.user)) - form = forms.DublinCoreForm(text=fulltext) - return HttpResponse( json.dumps({'result': 'ok', 'content': fulltext}) ) - -# Display the main editor view + 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 display_editor(request, path): - return direct_to_template(request, 'explorer/editor.html', extra_context={ - 'hash': path, 'panel_list': ['lewy', 'prawy'], - }) - -# =============== -# = Panel views = -# =============== - -@ajax_login_required -@with_repo -def xmleditor_panel(request, path, repo): - form = forms.BookForm() - text = repo.get_file(path, models.user_branch(request.user)) - - return direct_to_template(request, 'explorer/panels/xmleditor.html', extra_context={ - 'fpath': path, - 'text': text, - }) +def print_html(request, **kwargs): + from api.resources import document_html_resource + output = document_html_resource.handler.read(request, **kwargs) -@ajax_login_required -def gallery_panel(request, path): - return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={ - 'fpath': path, - 'form': forms.ImageFoldersForm(), - }) - -@ajax_login_required -@with_repo -def htmleditor_panel(request, path, repo): - user_branch = models.user_branch(request.user) - return direct_to_template(request, 'explorer/panels/htmleditor.html', extra_context={ - 'fpath': path, - 'html': html.transform(repo.get_file(path, user_branch), is_file=False), - }) - - -@ajax_login_required -@with_repo -def dceditor_panel(request, path, repo): - user_branch = models.user_branch(request.user) - text = repo.get_file(path, user_branch) - form = forms.DublinCoreForm(text=text) - - return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={ - 'fpath': path, - 'form': form, - }) - - -# ================= -# = Utility views = -# ================= -@ajax_login_required -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 _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 - 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() - # ================= # = Pull requests = # ================= -def pull_requests(request): - return direct_to_template(request, 'manager/pull_request.html', extra_context = { - 'objects': models.PullRequest.objects.all()} ) +#def pull_requests(request): +# return direct_to_template(request, 'manager/pull_request.html', extra_context = { +# 'objects': models.PullRequest.objects.all()} )