X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/f02d58db2f0a5f06c38d669c4b4c4fff95e55395..92e5a00682baeaa5a8c293351d270acee6e72a69:/apps/explorer/views.py diff --git a/apps/explorer/views.py b/apps/explorer/views.py index c1d8fb47..585edccb 100644 --- a/apps/explorer/views.py +++ b/apps/explorer/views.py @@ -1,12 +1,19 @@ 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 from django.conf import settings from django.http import HttpResponseRedirect, HttpResponse -from django.contrib.auth.decorators import login_required + +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 explorer import forms, models @@ -34,12 +41,44 @@ def ajax_login_required(view): # # 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 + + try: + files = paginator.page(page) + except (EmptyPage, InvalidPage): + files = paginator.page(paginator.num_pages) + return direct_to_template(request, 'explorer/file_list.html', extra_context={ - 'objects': repo.all_files(), + 'files': files, 'page': page, '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 # @@ -53,9 +92,8 @@ def file_xml(request, repo, path): print 'Saving whole text.', request.user.username def save_action(): print 'In branch: ' + repo.repo[None].branch() - print repo._add_file(path, form.cleaned_data['content']) - print repo.repo.status() - print repo._commit(message='Local save at %s' % time.ctime(), user=request.user.username) + 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" @@ -75,8 +113,26 @@ def file_xml(request, repo, path): def file_dc(request, path, repo): if request.method == 'POST': form = forms.DublinCoreForm(request.POST) + if form.is_valid(): - form.save(repo, path) + 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"