X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/70f40902039374237390366dd06319fed5c45ee7..806f7ea48c066ee89bcbc0035ae3b7d2bff7186b:/apps/explorer/views.py?ds=sidebyside diff --git a/apps/explorer/views.py b/apps/explorer/views.py index 585edccb..251ad214 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -1,21 +1,18 @@ -from librarian import html -import hg, urllib2, time - -from django.utils import simplejson as json -from lxml import etree -from librarian import dcparser - -from django.views.generic.simple import direct_to_template +# -*- coding: utf-8 -*- +import urllib2 +import hg +from librarian import html, parser, dcparser, ParseError, ValidationError from django.conf import settings -from django.http import HttpResponseRedirect, HttpResponse - -from django.core.urlresolvers import reverse -from django.core.paginator import Paginator, InvalidPage, EmptyPage - 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.utils import simplejson as json +from django.views.generic.simple import direct_to_template from explorer import forms, models +from toolbar import models as toolbar_models # # Some useful decorators @@ -63,21 +60,43 @@ def file_list(request, repo): @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}) ) - + other_errors = [] + if request.method == 'POST': + form = forms.BookUploadForm(request.POST, request.FILES) + if form.is_valid(): + try: + # prepare the data + f = request.FILES['file'] + decoded = f.read().decode('utf-8') + + 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 \ + ) + + # end of upload + + repo.in_branch(upload_action, 'default') + + # if everything is ok, redirect to the editor + return HttpResponseRedirect( reverse('editor_view', + kwargs={'path': f.name}) ) + + except hg.RepositoryException, e: + other_errors.append(u'Błąd repozytorium: ' + unicode(e) ) + except UnicodeDecodeError, e: + other_errors.append(u'Niepoprawne kodowanie pliku: ' + e.reason \ + + u'. Żądane kodowanie: ' + e.encoding) + # invalid form + + # get + form = forms.BookUploadForm() return direct_to_template(request, 'explorer/file_upload.html', - extra_context = {'form' : form} ) + extra_context = {'form' : form, 'other_errors': other_errors}) # # Edit the file @@ -87,21 +106,28 @@ def file_upload(request, repo): @with_repo def file_xml(request, repo, path): if request.method == 'POST': + errors = None 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) + repo._commit(message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'),\ + user=request.user.username) + try: + # wczytaj dokument z ciągu znaków -> weryfikacja + document = parser.WLDocument.from_string(form.cleaned_data['content']) + + # save to user's branch + repo.in_branch(save_action, models.user_branch(request.user) ); + except (ParseError, ValidationError), e: + errors = [e.message] - print repo.in_branch(save_action, models.user_branch(request.user) ); - result = "ok" - else: - result = "error" + if not errors: + errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() ) - errors = dict( (field[0], field[1].as_text()) for field in form.errors.iteritems() ) - return HttpResponse( json.dumps({'result': result, 'errors': errors}) ); + return HttpResponse(json.dumps({'result': errors and 'error' or 'ok', 'errors': errors})); form = forms.BookForm() data = repo.get_file(path, models.user_branch(request.user)) @@ -111,45 +137,58 @@ def file_xml(request, repo, path): @ajax_login_required @with_repo def file_dc(request, path, repo): + errors = None + if request.method == 'POST': form = forms.DublinCoreForm(request.POST) 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" - 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}) ); + # wczytaj dokument z repozytorium + document = parser.WLDocument.from_string(file_contents) + document.book_info.update(form.cleaned_data) + + print "SAVING DC" + + # zapisz + repo._add_file(path, document.serialize()) + repo._commit( \ + message=(form.cleaned_data['commit_message'] or 'Lokalny zapis platformy.'), \ + user=request.user.username ) + + try: + repo.in_branch(save_action, models.user_branch(request.user) ) + except (ParseError, ValidationError), e: + errors = [e.message] + + if errors is None: + errors = ["Pole '%s': %s\n" % (field[0], field[1].as_text()) for field in form.errors.iteritems()] + + return HttpResponse( json.dumps({'result': errors and 'error' or 'ok', '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}) ) + # this is unused currently, but may come in handy + content = [] + + try: + fulltext = repo.get_file(path, models.user_branch(request.user)) + bookinfo = dcparser.BookInfo.from_string(fulltext) + content = bookinfo.to_dict() + except (ParseError, ValidationError), e: + errors = [e.message] + + return HttpResponse( json.dumps({'result': errors and 'error' or 'ok', + 'errors': errors, 'content': content }) ) # Display the main editor view @login_required def display_editor(request, path): return direct_to_template(request, 'explorer/editor.html', extra_context={ - 'hash': path, 'panel_list': ['lewy', 'prawy'], + 'hash': path, + 'panel_list': ['lewy', 'prawy'], + 'scriptlets': toolbar_models.Scriptlet.objects.all() }) # =============== @@ -179,24 +218,32 @@ def gallery_panel(request, path): @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), - }) - + try: + 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), + }) + except (ParseError, ValidationError), e: + return direct_to_template(request, 'explorer/panels/parse_error.html', extra_context={ + 'fpath': path, 'exception_type': type(e).__name__, 'exception': e, 'panel_name': 'Edytor HTML'}) @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, - }) + try: + doc_text = repo.get_file(path, user_branch) + document = parser.WLDocument.from_string(doc_text) + form = forms.DublinCoreForm(info=document.book_info) + return direct_to_template(request, 'explorer/panels/dceditor.html', extra_context={ + 'fpath': path, + 'form': form, + }) + except (ParseError, ValidationError), e: + return direct_to_template(request, 'explorer/panels/parse_error.html', extra_context={ + 'fpath': path, 'exception_type': type(e).__name__, 'exception': e, + 'panel_name': 'Edytor DublinCore'}) # ================= # = Utility views =