https fix

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index ef8d83a..84cc097 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -58,10 +58,12 @@ def user(request, username):
 @active_tab('my')
 @never_cache
 def my(request):
 @active_tab('my')
 @never_cache
 def my(request):

+    last_books = sorted(request.session.get("wiki_last_books", {}).items(),
+        key=lambda x: x[1]['time'], reverse=True)
+    for k, v in last_books:
+        v['time'] = datetime.fromtimestamp(v['time'])

     return render(request, 'catalogue/my_page.html', {
     return render(request, 'catalogue/my_page.html', {

-        'last_books': sorted(request.session.get("wiki_last_books", {}).items(),
-                        key=lambda x: x[1]['time'], reverse=True),
-
+        'last_books': last_books,

         "logout_to": '/',
         })
 
         "logout_to": '/',
         })
 


@@ -142,7 +144,7 @@ def upload(request):
     if request.method == "POST":
         form = forms.DocumentsUploadForm(request.POST, request.FILES)
         if form.is_valid():
     if request.method == "POST":
         form = forms.DocumentsUploadForm(request.POST, request.FILES)
         if form.is_valid():

-            from fnpdjango.utils.text.slughifi import slughifi
+            from slugify import slugify

 
             if request.user.is_authenticated():
                 creator = request.user
 
             if request.user.is_authenticated():
                 creator = request.user


@@ -159,7 +161,7 @@ def upload(request):
                 if filename[-1] == '/':
                     continue
                 title = os.path.basename(filename)[:-4]
                 if filename[-1] == '/':
                     continue
                 title = os.path.basename(filename)[:-4]

-                slug = slughifi(title)
+                slug = slugify(title)

                 if not (slug and filename.endswith('.xml')):
                     skipped_list.append(filename)
                 elif slug in slugs:
                 if not (slug and filename.endswith('.xml')):
                     skipped_list.append(filename)
                 elif slug in slugs:


@@ -208,7 +210,7 @@ def book_xml(request, slug):
         return HttpResponseForbidden("Not authorized.")
     xml = book.materialize()
 
         return HttpResponseForbidden("Not authorized.")
     xml = book.materialize()
 

-    response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml')
+    response = http.HttpResponse(xml, content_type='application/xml')

     response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
     return response
 
     response['Content-Disposition'] = 'attachment; filename=%s.xml' % slug
     return response
 


@@ -221,7 +223,7 @@ def book_txt(request, slug):
 
     doc = book.wldocument()
     text = doc.as_text().get_string()
 
     doc = book.wldocument()
     text = doc.as_text().get_string()

-    response = http.HttpResponse(text, content_type='text/plain', mimetype='text/plain')
+    response = http.HttpResponse(text, content_type='text/plain')

     response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug
     return response
 
     response['Content-Disposition'] = 'attachment; filename=%s.txt' % slug
     return response
 


@@ -233,10 +235,10 @@ def book_html(request, slug):
         return HttpResponseForbidden("Not authorized.")
 
     doc = book.wldocument(parse_dublincore=False)
         return HttpResponseForbidden("Not authorized.")
 
     doc = book.wldocument(parse_dublincore=False)

-    html = doc.as_html()
+    html = doc.as_html(options={'gallery': "'%s'" % book.gallery_url()})

 
     html = html.get_string() if html is not None else ''
 
     html = html.get_string() if html is not None else ''

-    # response = http.HttpResponse(html, content_type='text/html', mimetype='text/html')
+    # response = http.HttpResponse(html, content_type='text/html')

     # return response
     # book_themes = {}
     # for fragment in book.fragments.all().iterator():
     # return response
     # book_themes = {}
     # for fragment in book.fragments.all().iterator():


@@ -257,7 +259,7 @@ def book_pdf(request, slug):
     # TODO: move to celery
     doc = book.wldocument()
     # TODO: error handling
     # TODO: move to celery
     doc = book.wldocument()
     # TODO: error handling

-    pdf_file = doc.as_pdf()
+    pdf_file = doc.as_pdf(cover=True, ilustr_path=book.gallery_path())

     from catalogue.ebook_utils import serve_file
     return serve_file(pdf_file.get_filename(),
                 book.slug + '.pdf', 'application/pdf')
     from catalogue.ebook_utils import serve_file
     return serve_file(pdf_file.get_filename(),
                 book.slug + '.pdf', 'application/pdf')


@@ -272,13 +274,29 @@ def book_epub(request, slug):
     # TODO: move to celery
     doc = book.wldocument()
     # TODO: error handling
     # TODO: move to celery
     doc = book.wldocument()
     # TODO: error handling

-    epub = doc.as_epub().get_string()
-    response = HttpResponse(mimetype='application/epub+zip')
+    epub = doc.as_epub(ilustr_path=book.gallery_path()).get_string()
+    response = HttpResponse(content_type='application/epub+zip')

     response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.epub'
     response.write(epub)
     return response
 
 
     response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.epub'
     response.write(epub)
     return response
 
 

+@never_cache
+def book_mobi(request, slug):
+    book = get_object_or_404(Book, slug=slug)
+    if not book.accessible(request):
+        return HttpResponseForbidden("Not authorized.")
+
+    # TODO: move to celery
+    doc = book.wldocument()
+    # TODO: error handling
+    mobi = doc.as_mobi(ilustr_path=book.gallery_path()).get_string()
+    response = HttpResponse(content_type='application/x-mobipocket-ebook')
+    response['Content-Disposition'] = 'attachment; filename=%s' % book.slug + '.mobi'
+    response.write(mobi)
+    return response
+
+

 @never_cache
 def revision(request, slug, chunk=None):
     try:
 @never_cache
 def revision(request, slug, chunk=None):
     try:


@@ -424,7 +442,7 @@ def chunk_edit(request, slug, chunk):
     })
 
 
     })
 
 

-@transaction.commit_on_success
+@transaction.atomic

 @login_required
 @require_POST
 def chunk_mass_edit(request):
 @login_required
 @require_POST
 def chunk_mass_edit(request):


@@ -467,7 +485,7 @@ def chunk_mass_edit(request):
     return HttpResponse("", content_type="text/plain")
 
 
     return HttpResponse("", content_type="text/plain")
 
 

-@transaction.commit_on_success
+@transaction.atomic

 @login_required
 @require_POST
 def image_mass_edit(request):
 @login_required
 @require_POST
 def image_mass_edit(request):


@@ -538,7 +556,8 @@ def publish(request, slug):
         return HttpResponseForbidden("Not authorized.")
 
     try:
         return HttpResponseForbidden("Not authorized.")
 
     try:

-        book.publish(request.user)
+        protocol = 'https://' if request.is_secure() else 'http://'
+        book.publish(request.user, host=protocol + request.get_host())

     except NotAuthorizedError:
         return http.HttpResponseRedirect(reverse('apiclient_oauth'))
     except BaseException, e:
     except NotAuthorizedError:
         return http.HttpResponseRedirect(reverse('apiclient_oauth'))
     except BaseException, e: