Merge branch 'master' into with-dvcs
[redakcja.git] / apps / wiki / views.py
index 0821488..75650e0 100644 (file)
@@ -1,85 +1,35 @@
+from datetime import datetime
 import os
-from StringIO import StringIO
 import logging
-logger = logging.getLogger("fnp.wiki")
-
-from lxml import etree
 
 from django.conf import settings
-
-from django.contrib.auth.models import User
-from django.contrib.auth.decorators import login_required
-from django.views.generic.simple import direct_to_template
-from django.views.decorators.http import require_POST, require_GET
 from django.core.urlresolvers import reverse
-from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
-                ajax_require_permission, recursive_groupby, active_tab)
 from django import http
-from django.shortcuts import get_object_or_404, redirect
 from django.http import Http404
-
-from wiki.models import Book, Chunk, Theme
-from wiki import forms
-from datetime import datetime
+from django.middleware.gzip import GZipMiddleware
+from django.utils.decorators import decorator_from_middleware
 from django.utils.encoding import smart_unicode
 from django.utils.translation import ugettext_lazy as _
-from django.utils.decorators import decorator_from_middleware
-from django.middleware.gzip import GZipMiddleware
+from django.views.decorators.http import require_POST, require_GET
+from django.views.generic.simple import direct_to_template
 
-import librarian.html
-import librarian.text
-from wiki import xml_tools
-from apiclient import api_call
+from catalogue.models import Book, Chunk
+import nice_diff
+from wiki import forms
+from wiki.helpers import (JSONResponse, JSONFormInvalid, JSONServerError,
+                ajax_require_permission)
+from wiki.models import Theme
 
 #
 # Quick hack around caching problems, TODO: use ETags
 #
 from django.views.decorators.cache import never_cache
 
-import nice_diff
-import operator
+logger = logging.getLogger("fnp.wiki")
 
 MAX_LAST_DOCS = 10
 
 
-@active_tab('all')
-@never_cache
-def document_list(request):
-    return direct_to_template(request, 'wiki/document_list.html', extra_context={
-        'books': Book.objects.all(),
-        'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
-                        key=lambda x: x[1]['time'], reverse=True),
-    })
-
-
-@active_tab('unassigned')
-@never_cache
-def unassigned(request):
-    return direct_to_template(request, 'wiki/document_list.html', extra_context={
-        'books': Chunk.objects.filter(user=None),
-        'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
-                        key=lambda x: x[1]['time'], reverse=True),
-    })
-
-
-@never_cache
-def user(request, username=None):
-    if username is None:
-        if request.user.is_authenticated():
-            user = request.user
-        else:
-            raise Http404
-    else:
-        user = get_object_or_404(User, username=username)
-
-    return direct_to_template(request, 'wiki/document_list.html', extra_context={
-        'books': Chunk.objects.filter(user=user),
-        'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
-                        key=lambda x: x[1]['time'], reverse=True),
-    })
-my = login_required(active_tab('my')(user))
-
-
 @never_cache
 def editor(request, slug, chunk=None, template_name='wiki/document_details.html'):
     try:
@@ -92,7 +42,7 @@ def editor(request, slug, chunk=None, template_name='wiki/document_details.html'
             try:
                 book = Book.objects.get(slug=slug)
             except Book.DoesNotExist:
-                return http.HttpResponseRedirect(reverse("wiki_create_missing", args=[slug]))
+                return http.HttpResponseRedirect(reverse("catalogue_create_missing", args=[slug]))
         else:
             raise Http404
 
@@ -113,7 +63,6 @@ def editor(request, slug, chunk=None, template_name='wiki/document_details.html'
         'forms': {
             "text_save": forms.DocumentTextSaveForm(prefix="textsave"),
             "text_revert": forms.DocumentTextRevertForm(prefix="textrevert"),
-            "add_tag": forms.DocumentTagForm(prefix="addtag"),
             "pubmark": forms.DocumentPubmarkForm(prefix="pubmark"),
         },
         'REDMINE_URL': settings.REDMINE_URL,
@@ -148,98 +97,6 @@ def editor_readonly(request, slug, chunk=None, template_name='wiki/document_deta
     })
 
 
-@active_tab('create')
-def create_missing(request, slug=None):
-    if slug is None:
-        slug = ''
-    slug = slug.replace(' ', '-')
-
-    if request.method == "POST":
-        form = forms.DocumentCreateForm(request.POST, request.FILES)
-        if form.is_valid():
-            
-            if request.user.is_authenticated():
-                creator = request.user
-            else:
-                creator = None
-            book = Book.create(creator=creator,
-                slug=form.cleaned_data['slug'],
-                title=form.cleaned_data['title'],
-                text=form.cleaned_data['text'],
-            )
-
-            return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug]))
-    else:
-        form = forms.DocumentCreateForm(initial={
-                "slug": slug,
-                "title": slug.replace('-', ' ').title(),
-        })
-
-    return direct_to_template(request, "wiki/document_create_missing.html", extra_context={
-        "slug": slug,
-        "form": form,
-    })
-
-
-@active_tab('upload')
-def upload(request):
-    if request.method == "POST":
-        form = forms.DocumentsUploadForm(request.POST, request.FILES)
-        if form.is_valid():
-            import slughifi
-
-            if request.user.is_authenticated():
-                creator = request.user
-            else:
-                creator = None
-
-            zip = form.cleaned_data['zip']
-            skipped_list = []
-            ok_list = []
-            error_list = []
-            slugs = {}
-            existing = [book.slug for book in Book.objects.all()]
-            for filename in zip.namelist():
-                if filename[-1] == '/':
-                    continue
-                title = os.path.basename(filename)[:-4]
-                slug = slughifi(title)
-                if not (slug and filename.endswith('.xml')):
-                    skipped_list.append(filename)
-                elif slug in slugs:
-                    error_list.append((filename, slug, _('Slug already used for %s' % slugs[slug])))
-                elif slug in existing:
-                    error_list.append((filename, slug, _('Slug already used in repository.')))
-                else:
-                    try:
-                        zip.read(filename).decode('utf-8') # test read
-                        ok_list.append((filename, slug, title))
-                    except UnicodeDecodeError:
-                        error_list.append((filename, title, _('File should be UTF-8 encoded.')))
-                    slugs[slug] = filename
-
-            if not error_list:
-                for filename, slug, title in ok_list:
-                    Book.create(creator=creator,
-                        slug=slug,
-                        title=title,
-                        text=zip.read(filename).decode('utf-8'),
-                    )
-
-            return direct_to_template(request, "wiki/document_upload.html", extra_context={
-                "form": form,
-                "ok_list": ok_list,
-                "skipped_list": skipped_list,
-                "error_list": error_list,
-            })
-    else:
-        form = forms.DocumentsUploadForm()
-
-    return direct_to_template(request, "wiki/document_upload.html", extra_context={
-        "form": form,
-    })
-
-
 @never_cache
 @decorator_from_middleware(GZipMiddleware)
 def text(request, slug, chunk=None):
@@ -289,39 +146,6 @@ def text(request, slug, chunk=None):
         })
 
 
-@never_cache
-def book_xml(request, slug):
-    xml = get_object_or_404(Book, slug=slug).materialize()
-
-    response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml')
-    response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
-    return response
-
-
-@never_cache
-def book_txt(request, slug):
-    xml = get_object_or_404(Book, slug=slug).materialize()
-    output = StringIO()
-    # errors?
-    librarian.text.transform(StringIO(xml), output)
-    text = output.getvalue()
-    response = http.HttpResponse(text, content_type='text/plain', mimetype='text/plain')
-    response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug
-    return response
-
-
-@never_cache
-def book_html(request, slug):
-    xml = get_object_or_404(Book, slug=slug).materialize()
-    output = StringIO()
-    # errors?
-    librarian.html.transform(StringIO(xml), output, parse_dublincore=False,
-                             flags=['full-page'])
-    html = output.getvalue()
-    response = http.HttpResponse(html, content_type='text/html', mimetype='text/html')
-    return response
-
-
 @never_cache
 @require_POST
 def revert(request, slug, chunk=None):
@@ -434,198 +258,6 @@ def history(request, slug, chunk=None):
     return JSONResponse(changes)
 
 
-def book(request, slug):
-    book = get_object_or_404(Book, slug=slug)
-
-    # TODO: most of this should go somewhere else
-
-    # do we need some automation?
-    first_master = None
-    chunks = []
-    need_fixing = False
-    choose_master = False
-
-    length = len(book)
-    for i, chunk in enumerate(book):
-        chunk_dict = {
-            "chunk": chunk,
-            "fix": [],
-            "grade": ""
-            }
-        graded = xml_tools.GradedText(chunk.materialize())
-        if graded.is_wl():
-            master = graded.master()
-            if first_master is None:
-                first_master = master
-            elif master != first_master:
-                chunk_dict['fix'].append('bad-master')
-
-            if i > 0 and not graded.has_trim_begin():
-                chunk_dict['fix'].append('trim-begin')
-            if i < length - 1 and not graded.has_trim_end():
-                chunk_dict['fix'].append('trim-end')
-
-            if chunk_dict['fix']:
-                chunk_dict['grade'] = 'wl-fix'
-            else:
-                chunk_dict['grade'] = 'wl'
-
-        elif graded.is_broken_wl():
-            chunk_dict['grade'] = 'wl-broken'
-        elif graded.is_xml():
-            chunk_dict['grade'] = 'xml'
-        else:
-            chunk_dict['grade'] = 'plain'
-            chunk_dict['fix'].append('wl')
-            choose_master = True
-
-        if chunk_dict['fix']:
-            need_fixing = True
-        chunks.append(chunk_dict)
-
-    if first_master or not need_fixing:
-        choose_master = False
-
-    if request.method == "POST":
-        form = forms.ChooseMasterForm(request.POST)
-        if not choose_master or form.is_valid():
-            if choose_master:
-                first_master = form.cleaned_data['master']
-
-            # do the actual fixing
-            for c in chunks:
-                if not c['fix']:
-                    continue
-
-                text = c['chunk'].materialize()
-                for fix in c['fix']:
-                    if fix == 'bad-master':
-                        text = xml_tools.change_master(text, first_master)
-                    elif fix == 'trim-begin':
-                        text = xml_tools.add_trim_begin(text)
-                    elif fix == 'trim-end':
-                        text = xml_tools.add_trim_end(text)
-                    elif fix == 'wl':
-                        text = xml_tools.basic_structure(text, first_master)
-                author = request.user if request.user.is_authenticated() else None
-                description = "auto-fix: " + ", ".join(c['fix'])
-                c['chunk'].commit(text=text, author=author, 
-                    description=description)
-
-            return http.HttpResponseRedirect(book.get_absolute_url())
-    elif choose_master:
-        form = forms.ChooseMasterForm()
-    else:
-        form = None
-
-    return direct_to_template(request, "wiki/book_detail.html", extra_context={
-        "book": book,
-        "chunks": chunks,
-        "need_fixing": need_fixing,
-        "choose_master": choose_master,
-        "first_master": first_master,
-        "form": form,
-    })
-
-
-def chunk_add(request, slug, chunk):
-    try:
-        doc = Chunk.get(slug, chunk)
-    except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-        raise Http404
-
-    if request.method == "POST":
-        form = forms.ChunkAddForm(request.POST, instance=doc)
-        if form.is_valid():
-            if request.user.is_authenticated():
-                creator = request.user
-            else:
-                creator = None
-            doc.split(creator=creator,
-                slug=form.cleaned_data['slug'],
-                comment=form.cleaned_data['comment'],
-            )
-
-            return http.HttpResponseRedirect(doc.book.get_absolute_url())
-    else:
-        form = forms.ChunkAddForm(initial={
-                "slug": str(doc.number + 1),
-                "comment": "cz. %d" % (doc.number + 1, ),
-        })
-
-    return direct_to_template(request, "wiki/chunk_add.html", extra_context={
-        "chunk": doc,
-        "form": form,
-    })
-
-
-def chunk_edit(request, slug, chunk):
-    try:
-        doc = Chunk.get(slug, chunk)
-    except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-        raise Http404
-    if request.method == "POST":
-        form = forms.ChunkForm(request.POST, instance=doc)
-        if form.is_valid():
-            form.save()
-            return http.HttpResponseRedirect(doc.book.get_absolute_url())
-    else:
-        form = forms.ChunkForm(instance=doc)
-    return direct_to_template(request, "wiki/chunk_edit.html", extra_context={
-        "chunk": doc,
-        "form": form,
-    })
-
-
-def book_append(request, slug):
-    book = get_object_or_404(Book, slug=slug)
-    if request.method == "POST":
-        form = forms.BookAppendForm(request.POST)
-        if form.is_valid():
-            append_to = form.cleaned_data['append_to']
-            append_to.append(book)
-            return http.HttpResponseRedirect(append_to.get_absolute_url())
-    else:
-        form = forms.BookAppendForm()
-    return direct_to_template(request, "wiki/book_append_to.html", extra_context={
-        "book": book,
-        "form": form,
-    })
-
-
-def book_edit(request, slug):
-    book = get_object_or_404(Book, slug=slug)
-    if request.method == "POST":
-        form = forms.BookForm(request.POST, instance=book)
-        if form.is_valid():
-            form.save()
-            return http.HttpResponseRedirect(book.get_absolute_url())
-    else:
-        form = forms.BookForm(instance=book)
-    return direct_to_template(request, "wiki/book_edit.html", extra_context={
-        "book": book,
-        "form": form,
-    })
-
-
-@require_POST
-@ajax_require_permission('wiki.can_change_tags')
-def add_tag(request, slug, chunk=None):
-    form = forms.DocumentTagForm(request.POST, prefix="addtag")
-    if form.is_valid():
-        try:
-            doc = Chunk.get(slug, chunk)
-        except (Chunk.MultipleObjectsReturned, Chunk.DoesNotExist):
-            raise Http404
-
-        tag = form.cleaned_data['tag']
-        revision = form.cleaned_data['revision']
-        doc.at_revision(revision).tags.add(tag)
-        return JSONResponse({"message": _("Tag added")})
-    else:
-        return JSONFormInvalid(form)
-
-
 @require_POST
 @ajax_require_permission('wiki.can_pubmark')
 def pubmark(request, slug, chunk=None):
@@ -639,7 +271,6 @@ def pubmark(request, slug, chunk=None):
         revision = form.cleaned_data['revision']
         publishable = form.cleaned_data['publishable']
         change = doc.at_revision(revision)
-        print publishable, change.publishable
         if publishable != change.publishable:
             change.publishable = publishable
             change.save()
@@ -650,20 +281,6 @@ def pubmark(request, slug, chunk=None):
         return JSONFormInvalid(form)
 
 
-@require_POST
-@login_required
-def publish(request, slug):
-    book = get_object_or_404(Book, slug=slug)
-    try:
-        ret = api_call(request.user, "books", {"book_xml": book.materialize()})
-    except BaseException, e:
-        return http.HttpResponse(e)
-    else:
-        book.last_published = datetime.now()
-        book.save()
-        return http.HttpResponseRedirect(book.get_absolute_url())
-
-
 def themes(request):
     prefix = request.GET.get('q', '')
     return http.HttpResponse('\n'.join([str(t) for t in Theme.objects.filter(name__istartswith=prefix)]))