and some more fixes

[redakcja.git] / apps / catalogue / views.py

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index f56ec5b..74036f0 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -10,21 +10,22 @@ from django.contrib.auth.models import User
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.urlresolvers import reverse
 from django.db.models import Count, Q
 from django.contrib.auth.decorators import login_required, permission_required
 from django.core.urlresolvers import reverse
 from django.db.models import Count, Q

+from django.db import transaction

 from django import http
 from django.http import Http404, HttpResponse, HttpResponseForbidden
 from django import http
 from django.http import Http404, HttpResponse, HttpResponseForbidden

-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import get_object_or_404, render, render_to_response

 from django.utils.encoding import iri_to_uri
 from django.utils.http import urlquote_plus
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import require_POST
 from django.views.generic.simple import direct_to_template
 from django.utils.encoding import iri_to_uri
 from django.utils.http import urlquote_plus
 from django.utils.translation import ugettext_lazy as _
 from django.views.decorators.http import require_POST
 from django.views.generic.simple import direct_to_template

+from django.template import RequestContext

 
 from apiclient import NotAuthorizedError
 from catalogue import forms
 from catalogue import helpers
 from catalogue.helpers import active_tab
 from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord
 
 from apiclient import NotAuthorizedError
 from catalogue import forms
 from catalogue import helpers
 from catalogue.helpers import active_tab
 from catalogue.models import Book, Chunk, BookPublishRecord, ChunkPublishRecord

-from catalogue.tasks import publishable_error

 
 #
 # Quick hack around caching problems, TODO: use ETags
 
 #
 # Quick hack around caching problems, TODO: use ETags


@@ -210,13 +211,9 @@ def book_txt(request, slug):
     book = get_object_or_404(Book, slug=slug)
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
     book = get_object_or_404(Book, slug=slug)
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")

-    xml = book.materialize()
-    output = StringIO()
-    # errors?

 
 

-    import librarian.text
-    librarian.text.transform(StringIO(xml), output)
-    text = output.getvalue()
+    doc = book.wldocument()
+    text = doc.as_text().get_string()

     response = http.HttpResponse(text, content_type='text/plain', mimetype='text/plain')
     response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug
     return response
     response = http.HttpResponse(text, content_type='text/plain', mimetype='text/plain')
     response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug
     return response


@@ -227,16 +224,22 @@ def book_html(request, slug):
     book = get_object_or_404(Book, slug=slug)
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
     book = get_object_or_404(Book, slug=slug)
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")

-    xml = book.materialize()
-    output = StringIO()
-    # errors?
-
-    import librarian.html
-    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
+
+    doc = book.wldocument(parse_dublincore=False)
+    html = doc.as_html()
+
+    html = html.get_string() if html is not None else ''
+    # response = http.HttpResponse(html, content_type='text/html', mimetype='text/html')
+    # return response
+    # book_themes = {}
+    # for fragment in book.fragments.all().iterator():
+    #     for theme in fragment.tags.filter(category='theme').iterator():
+    #         book_themes.setdefault(theme, []).append(fragment)
+
+    # book_themes = book_themes.items()
+    # book_themes.sort(key=lambda s: s[0].sort_key)
+    return render_to_response('catalogue/book_text.html', locals(),
+        context_instance=RequestContext(request))

 
 
 @never_cache
 
 
 @never_cache


@@ -245,25 +248,13 @@ def book_pdf(request, slug):
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
 
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
 

-    from tempfile import NamedTemporaryFile
-    from os import unlink
-    from librarian import pdf
-    from catalogue.ebook_utils import RedakcjaDocProvider, serve_file
-
-    xml = book.materialize()
-    xml_file = NamedTemporaryFile()
-    xml_file.write(xml.encode('utf-8'))
-    xml_file.flush()
-
-    try:
-        pdf_file = NamedTemporaryFile(delete=False)
-        pdf.transform(RedakcjaDocProvider(publishable=True),
-                  file_path=xml_file.name,
-                  output_file=pdf_file,
-                  )
-        return serve_file(pdf_file.name, book.slug + '.pdf', 'application/pdf')
-    finally:
-        unlink(pdf_file.name)
+    # TODO: move to celery
+    doc = book.wldocument()
+    # TODO: error handling
+    pdf_file = doc.as_pdf()
+    from catalogue.ebook_utils import serve_file
+    return serve_file(pdf_file.get_filename(),
+                book.slug + '.pdf', 'application/pdf')

 
 
 @never_cache
 
 
 @never_cache


@@ -272,23 +263,13 @@ def book_epub(request, slug):
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
 
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
 

-    from StringIO import StringIO
-    from tempfile import NamedTemporaryFile
-    from librarian import epub
-    from catalogue.ebook_utils import RedakcjaDocProvider
-
-    xml = book.materialize()
-    xml_file = NamedTemporaryFile()
-    xml_file.write(xml.encode('utf-8'))
-    xml_file.flush()
-
-    epub_file = StringIO()
-    epub.transform(RedakcjaDocProvider(publishable=True),
-            file_path=xml_file.name,
-            output_file=epub_file)
+    # TODO: move to celery
+    doc = book.wldocument()
+    # TODO: error handling
+    epub = doc.as_epub().get_string()

     response = HttpResponse(mimetype='application/epub+zip')
     response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.epub'
     response = HttpResponse(mimetype='application/epub+zip')
     response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.epub'

-    response.write(epub_file.getvalue())
+    response.write(epub)

     return response
 
 
     return response
 
 


@@ -321,7 +302,7 @@ def book(request, slug):
         form = forms.ReadonlyBookForm(instance=book)
         editable = False
 
         form = forms.ReadonlyBookForm(instance=book)
         editable = False
 

-    publish_error = publishable_error(book)
+    publish_error = book.publishable_error()

     publishable = publish_error is None
 
     return direct_to_template(request, "catalogue/book_detail.html", extra_context={
     publishable = publish_error is None
 
     return direct_to_template(request, "catalogue/book_detail.html", extra_context={


@@ -406,6 +387,54 @@ def chunk_edit(request, slug, chunk):
     })
 
 
     })
 
 

+@transaction.commit_on_success
+def chunk_mass_edit(request):
+    if request.method == 'POST':
+        ids = map(int, filter(lambda i: i.strip()!='', request.POST.get('ids').split(',')))
+        chunks = map(lambda i: Chunk.objects.get(id=i), ids)
+        
+        stage = request.POST.get('stage')
+        if stage:
+            try:
+                stage = Chunk.tag_model.objects.get(slug=stage)
+            except Chunk.DoesNotExist, e:
+                stage = None
+           
+            for c in chunks: c.stage = stage
+
+        username = request.POST.get('user')
+        logger.info("username: %s" % username)
+        logger.info(request.POST)
+        if username:
+            try:
+                user = User.objects.get(username=username)
+            except User.DoesNotExist, e:
+                user = None
+                
+            for c in chunks: c.user = user
+
+        status = request.POST.get('status')
+        if status:
+            books_affected = set()
+            for c in chunks:
+                if status == 'publish':
+                    c.head.publishable = True
+                    c.head.save()
+                elif status == 'unpublish':
+                    c.head.publishable = False
+                    c.head.save()
+                c.touch()  # cache
+                books_affected.add(c.book)
+            for b in books_affected:
+                b.touch()  # cache
+
+        for c in chunks: c.save()
+
+        return HttpResponse("", content_type="text/plain")
+    else:
+        raise Http404
+
+

 @permission_required('catalogue.change_book')
 def book_append(request, slug):
     book = get_object_or_404(Book, slug=slug)
 @permission_required('catalogue.change_book')
 def book_append(request, slug):
     book = get_object_or_404(Book, slug=slug)