fix unicode handling

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index 5aeab7a..fc572c2 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -1,3 +1,4 @@
+from collections import defaultdict

 from datetime import datetime, date, timedelta
 import logging
 import os
 from datetime import datetime, date, timedelta
 import logging
 import os


@@ -14,15 +15,18 @@ 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.db import transaction
 from django import http
 from django.http import Http404, HttpResponse, HttpResponseForbidden

+from django.http.response import HttpResponseRedirect

 from django.shortcuts import get_object_or_404, render
 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.shortcuts import get_object_or_404, render
 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_cas.decorators import user_passes_test

 
 from apiclient import NotAuthorizedError
 from catalogue import forms
 from catalogue import helpers
 
 from apiclient import NotAuthorizedError
 from catalogue import forms
 from catalogue import helpers

+from catalogue.forms import MarkFinalForm

 from catalogue.helpers import active_tab
 from catalogue.models import (Book, Chunk, Image, BookPublishRecord, 
         ChunkPublishRecord, ImagePublishRecord, Project)
 from catalogue.helpers import active_tab
 from catalogue.models import (Book, Chunk, Image, BookPublishRecord, 
         ChunkPublishRecord, ImagePublishRecord, Project)


@@ -144,7 +148,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


@@ -161,7 +165,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:


@@ -203,18 +207,27 @@ def upload(request):
     })
 
 
     })
 
 

-@never_cache
-def book_xml(request, slug):
-    book = get_object_or_404(Book, slug=slug)
+def serve_xml(request, book, slug):

     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")
     if not book.accessible(request):
         return HttpResponseForbidden("Not authorized.")

-    xml = book.materialize()
-
-    response = http.HttpResponse(xml, content_type='application/xml', mimetype='application/wl+xml')
+    xml = book.materialize(publishable=True)
+    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
 
 

+@never_cache
+def book_xml(request, slug):
+    book = get_object_or_404(Book, slug=slug)
+    return serve_xml(request, book, slug)
+
+
+@never_cache
+def book_xml_dc(request, slug):
+    book = get_object_or_404(Book, dc_slug=slug)
+    return serve_xml(request, book, slug)
+
+

 @never_cache
 def book_txt(request, slug):
     book = get_object_or_404(Book, slug=slug)
 @never_cache
 def book_txt(request, slug):
     book = get_object_or_404(Book, slug=slug)


@@ -223,7 +236,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
 


@@ -235,10 +248,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():


@@ -259,7 +272,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')


@@ -274,13 +287,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:


@@ -426,7 +455,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):


@@ -469,7 +498,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):


@@ -540,11 +569,12 @@ 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:

-        return http.HttpResponse(e)
+        return http.HttpResponse(repr(e))

     else:
         return http.HttpResponseRedirect(book.get_absolute_url())
 
     else:
         return http.HttpResponseRedirect(book.get_absolute_url())
 


@@ -582,3 +612,50 @@ class GalleryView(UploadView):
 
     def get_directory(self):
         return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery)
 
     def get_directory(self):
         return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery)

+
+
+def active_users_list(request):
+    since = date(date.today().year, 1, 1)
+    by_user = defaultdict(lambda: 0)
+    by_email = defaultdict(lambda: 0)
+    names_by_email = defaultdict(set)
+    for change_model in (Chunk.change_model, Image.change_model):
+        for c in change_model.objects.filter(
+                created_at__gte=since).order_by(
+                'author', 'author_email', 'author_name').values(
+                'author', 'author_name', 'author_email').annotate(
+                c=Count('author'), ce=Count('author_email')).distinct():
+            if c['author']:
+                by_user[c['author']] += c['c']
+            else:
+                by_email[c['author_email']] += c['ce']
+                if c['author_name'].strip():
+                    names_by_email[c['author_email']].add(c['author_name'])
+    for user in User.objects.filter(pk__in=by_user):
+        by_email[user.email] += by_user[user.pk]
+        names_by_email[user.email].add("%s %s" % (user.first_name, user.last_name))
+
+    active_users = []
+    for email, count in by_email.items():
+        active_users.append((email, names_by_email[email], count))
+    active_users.sort(key=lambda x: -x[2])
+    return render(request, 'catalogue/active_users_list.html', {
+        'users': active_users,
+        'since': since,
+    })
+
+
+@user_passes_test(lambda u: u.is_superuser)
+def mark_final(request):
+    if request.method == 'POST':
+        form = MarkFinalForm(data=request.POST)
+        if form.is_valid():
+            form.save()
+            return HttpResponseRedirect(reverse('mark_final_completed'))
+    else:
+        form = MarkFinalForm()
+    return render(request, 'catalogue/mark_final.html', {'form': form})
+
+
+def mark_final_completed(request):
+    return render(request, 'catalogue/mark_final_completed.html')