fix

[redakcja.git] / src / documents / views.py

diff --git a/src/documents/views.py b/src/documents/views.py
index 39320d5..0fbb3b9 100644 (file)
--- a/src/documents/views.py
+++ b/src/documents/views.py
@@ -23,7 +23,7 @@ from django.utils.translation import gettext_lazy as _
 from django.views.decorators.http import require_POST
 from django_cas_ng.decorators import user_passes_test
 
 from django.views.decorators.http import require_POST
 from django_cas_ng.decorators import user_passes_test
 

-from apiclient import NotAuthorizedError
+from apiclient import api_call, NotAuthorizedError

 from . import forms
 from . import helpers
 from .helpers import active_tab
 from . import forms
 from . import helpers
 from .helpers import active_tab


@@ -65,9 +65,17 @@ def my(request):
         key=lambda x: x[1]['time'], reverse=True)
     for k, v in last_books:
         v['time'] = datetime.fromtimestamp(v['time'])
         key=lambda x: x[1]['time'], reverse=True)
     for k, v in last_books:
         v['time'] = datetime.fromtimestamp(v['time'])

+    try:
+        resp = api_call(request.user, 'username/')
+    except NotAuthorizedError:
+        wllogin = None
+    else:
+        wllogin = resp['username']
+

     return render(request, 'documents/my_page.html', {
         'last_books': last_books,
         "logout_to": '/',
     return render(request, 'documents/my_page.html', {
         'last_books': last_books,
         "logout_to": '/',

+        "wllogin": wllogin,

         })
 
 
         })
 
 


@@ -287,11 +295,13 @@ def book_epub(request, slug):
         return HttpResponseForbidden("Not authorized.")
 
     # TODO: move to celery
         return HttpResponseForbidden("Not authorized.")
 
     # TODO: move to celery

-    doc = book.wldocument()
+    doc = book.wldocument(librarian2=True)

     # TODO: error handling
 
     # TODO: error handling
 

-    #### Problemas: images in children.
-    epub = doc.as_epub(base_url='file://' + book.gallery_path() + '/').get_bytes()
+    from librarian.builders import EpubBuilder
+    epub = EpubBuilder(
+        base_url='file://' + book.gallery_path() + '/'
+    ).build(doc).get_bytes()

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


@@ -306,9 +316,12 @@ def book_mobi(request, slug):
         return HttpResponseForbidden("Not authorized.")
 
     # TODO: move to celery
         return HttpResponseForbidden("Not authorized.")
 
     # TODO: move to celery

-    doc = book.wldocument()
+    doc = book.wldocument(librarian2=True)

     # TODO: error handling
     # TODO: error handling

-    mobi = doc.as_mobi(base_url='file://' + book.gallery_path() + '/').get_bytes()
+    from librarian.builders import MobiBuilder
+    mobi = MobiBuilder(
+        base_url='file://' + book.gallery_path() + '/'
+    ).build(doc).get_bytes()

     response = HttpResponse(content_type='application/x-mobipocket-ebook')
     response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.mobi'
     response.write(mobi)
     response = HttpResponse(content_type='application/x-mobipocket-ebook')
     response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.mobi'
     response.write(mobi)


@@ -349,14 +362,21 @@ def book(request, slug):
     publish_error = book.publishable_error()
     publishable = publish_error is None
 
     publish_error = book.publishable_error()
     publishable = publish_error is None
 

+    stats = None

     try:
     try:

-        doc = book.wldocument()
+        doc = book.wldocument(librarian2=True)

     except:
         doc = None
     except:
         doc = None

-    
+    else:
+        try:
+            stats = doc.get_statistic()
+        except:
+            pass
+

     return render(request, "documents/book_detail.html", {
         "book": book,
         "doc": doc,
     return render(request, "documents/book_detail.html", {
         "book": book,
         "doc": doc,

+        "stats": stats,

         "publishable": publishable,
         "publishable_error": publish_error,
         "form": form,
         "publishable": publishable,
         "publishable_error": publish_error,
         "form": form,