from librarian import html
-import hg, urllib2, json
+import hg, urllib2, time
+from django.utils import simplejson as json
from django.views.generic.simple import direct_to_template
+
from django.conf import settings
-from django.http import HttpResponseRedirect
+from django.http import HttpResponseRedirect, HttpResponse
+from django.contrib.auth.decorators import login_required
from explorer import forms, models
-repo = hg.Repository(settings.REPOSITORY_PATH)
-def file_list(request):
+def with_repo(func):
+ def inner(request, *args, **kwargs):
+ kwargs['repo'] = hg.Repository(settings.REPOSITORY_PATH)
+ return func(request, *args, **kwargs)
+ return inner
+
+@with_repo
+def file_list(request, repo):
return direct_to_template(request, 'explorer/file_list.html', extra_context={
'objects': repo.all_files(),
})
+#
+# Edit the file
+#
-
-def file_xml(request, path):
+@with_repo
+def file_xml(request, repo, path):
if request.method == 'POST':
form = forms.BookForm(request.POST)
if form.is_valid():
- repo.add_file(path, form.cleaned_data['text'])
- # issues = _get_issues_for_file(path)
- # commit_message = _add_references(form.cleaned_data['commit_message'], issued)
- repo.commit(message=form.cleaned_data['commit_message'], user=form.cleaned_data['user'])
- return HttpResponseRedirect(request.get_full_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)
+
+ 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}) );
else:
form = forms.BookForm()
- form.fields['text'].initial = repo.get_file(path).data()
-
- return direct_to_template(request, 'explorer/file_xml.html', extra_context={
- 'hash': path,
+ form.fields['content'].initial = repo.get_file(path, models.user_branch(request.user))
+ return direct_to_template(request, 'explorer/edit_text.html', extra_context={
'form': form,
- 'image_folders_form': forms.ImageFoldersForm(),
})
+@with_repo
+def file_dc(request, path, repo):
+ if request.method == 'POST':
+ form = forms.DublinCoreForm(request.POST)
+ if form.is_valid():
+ form.save(repo, path)
+ 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}) );
+ else:
+ fulltext = repo.get_file(path, models.user_branch(request.user))
+ form = forms.DublinCoreForm(text=fulltext)
-def file_html(request, path):
- return direct_to_template(request, 'explorer/file_html.html', extra_context={
- 'object': html.transform(repo.get_file(path).data(), is_file=False),
+ return direct_to_template(request, 'explorer/edit_dc.html', extra_context={
+ 'form': form,
+ 'fpath': path,
+ })
+
+# Display the main editor view
+def display_editor(request, path):
+ return direct_to_template(request, 'explorer/editor.html', extra_context={
'hash': path,
- 'image_folders_form': forms.ImageFoldersForm(),
})
-
+
+# ===============
+# = Panel views =
+# ===============
+
+@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 gallery_panel(request, path):
+ return direct_to_template(request, 'explorer/panels/gallery.html', extra_context={
+ 'fpath': path,
+ 'form': forms.ImageFoldersForm(),
+ })
+
+@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),
+ })
+
+
+@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 =
+# =================
def folder_images(request, folder):
return direct_to_template(request, 'explorer/folder_images.html', extra_context={
'images': models.get_images_from_folder(folder),
})
+
def _add_references(message, issues):
- for issue in issues:
- message += " refs #%d " % issue.id
- return message
+ 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[:-3]
- uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/%s/issues' % book_id)
+ book_id = path[:-4]
+ uf = None
try:
+ uf = urllib2.urlopen(settings.REDMINE_URL + 'publications/issues/%s.json' % book_id)
return json.loads(uf.read())
+ except urllib2.HTTPError:
+ return []
finally:
- uf.close()
+ if uf: uf.close()
fnp / redakcja.git / blobdiff