fix unicode problems in gallery view

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index f8ff599..94710ca 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -1,15 +1,16 @@
-from datetime import datetime, date, timedelta
+# -*- coding: utf-8 -*-
+from datetime import date, timedelta

 import logging
 import os
 import logging
 import os

-from StringIO import StringIO

 from urllib import unquote
 from urlparse import urlsplit, urlunsplit
 
 from urllib import unquote
 from urlparse import urlsplit, urlunsplit
 

+from django.conf import settings

 from django.contrib import auth
 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.contrib import auth
 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.db.models import Count

 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


@@ -18,15 +19,14 @@ 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.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 django.template import RequestContext
 

-from apiclient import NotAuthorizedError
+from apiclient import NotAuthorizedError, ApiError

 from catalogue import forms
 from catalogue import helpers
 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
+from catalogue.helpers import active_tab, ajax
+from catalogue.models import Book, Chunk, Project
+from fileupload.views import UploadView, PackageView

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


@@ -53,16 +53,16 @@ def user(request, username):
 @never_cache
 def my(request):
     return render(request, 'catalogue/my_page.html', {
 @never_cache
 def my(request):
     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),
-
-        "logout_to": '/',
-        })
+        'last_books': sorted(
+            request.session.get("wiki_last_books", {}).items(),
+            key=lambda x: x[1]['time'], reverse=True),
+        'logout_to': '/',
+    })

 
 
 @active_tab('users')
 def users(request):
 
 
 @active_tab('users')
 def users(request):

-    return direct_to_template(request, 'catalogue/user_list.html', extra_context={
+    return render(request, 'catalogue/user_list.html', {

         'users': User.objects.all().annotate(count=Count('chunk')).order_by(
             '-count', 'last_name', 'first_name'),
     })
         'users': User.objects.all().annotate(count=Count('chunk')).order_by(
             '-count', 'last_name', 'first_name'),
     })


@@ -114,15 +114,14 @@ def create_missing(request, slug=None):
                 gallery=form.cleaned_data['gallery'],
             )
 
                 gallery=form.cleaned_data['gallery'],
             )
 

-            return http.HttpResponseRedirect(reverse("catalogue_book", args=[book.slug]))
+            return http.HttpResponseRedirect(reverse("wiki_editor", args=[book.slug]))

     else:
         form = forms.DocumentCreateForm(initial={
                 "slug": slug,
                 "title": slug.replace('-', ' ').title(),
     else:
         form = forms.DocumentCreateForm(initial={
                 "slug": slug,
                 "title": slug.replace('-', ' ').title(),

-                "gallery": slug,

         })
 
         })
 

-    return direct_to_template(request, "catalogue/document_create_missing.html", extra_context={
+    return render(request, "catalogue/document_create_missing.html", {

         "slug": slug,
         "form": form,
 
         "slug": slug,
         "form": form,
 


@@ -136,7 +135,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():

-            import slughifi
+            from slughifi import slughifi

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


@@ -162,7 +161,7 @@ def upload(request):
                     error_list.append((filename, slug, _('Slug already used in repository.')))
                 else:
                     try:
                     error_list.append((filename, slug, _('Slug already used in repository.')))
                 else:
                     try:

-                        zip.read(filename).decode('utf-8') # test read
+                        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.')))
                         ok_list.append((filename, slug, title))
                     except UnicodeDecodeError:
                         error_list.append((filename, title, _('File should be UTF-8 encoded.')))


@@ -177,7 +176,7 @@ def upload(request):
                         title=title,
                     )
 
                         title=title,
                     )
 

-            return direct_to_template(request, "catalogue/document_upload.html", extra_context={
+            return render(request, "catalogue/document_upload.html", {

                 "form": form,
                 "ok_list": ok_list,
                 "skipped_list": skipped_list,
                 "form": form,
                 "ok_list": ok_list,
                 "skipped_list": skipped_list,


@@ -188,7 +187,7 @@ def upload(request):
     else:
         form = forms.DocumentsUploadForm()
 
     else:
         form = forms.DocumentsUploadForm()
 

-    return direct_to_template(request, "catalogue/document_upload.html", extra_context={
+    return render(request, "catalogue/document_upload.html", {

         "form": form,
 
         "logout_to": '/',
         "form": form,
 
         "logout_to": '/',


@@ -239,7 +238,8 @@ def book_html(request, slug):
 
     # book_themes = book_themes.items()
     # book_themes.sort(key=lambda s: s[0].sort_key)
 
     # book_themes = book_themes.items()
     # book_themes.sort(key=lambda s: s[0].sort_key)

-    return render_to_response('catalogue/book_text.html', locals(),
+    return render_to_response(
+        'catalogue/book_text.html', locals(),

         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 


@@ -254,8 +254,7 @@ def book_pdf(request, slug):
     # TODO: error handling
     pdf_file = doc.as_pdf()
     from catalogue.ebook_utils import serve_file
     # 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')
+    return serve_file(pdf_file.get_filename(), book.slug + '.pdf', 'application/pdf')

 
 
 @never_cache
 
 
 @never_cache


@@ -303,10 +302,10 @@ 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
 
     publishable = publish_error is None
 

-    return direct_to_template(request, "catalogue/book_detail.html", extra_context={
+    return render(request, "catalogue/book_detail.html", {

         "book": book,
         "publishable": publishable,
         "publishable_error": publish_error,
         "book": book,
         "publishable": publishable,
         "publishable_error": publish_error,


@@ -331,7 +330,8 @@ def chunk_add(request, slug, chunk):
                 creator = request.user
             else:
                 creator = None
                 creator = request.user
             else:
                 creator = None

-            doc.split(creator=creator,
+            doc.split(
+                creator=creator,

                 slug=form.cleaned_data['slug'],
                 title=form.cleaned_data['title'],
                 gallery_start=form.cleaned_data['gallery_start'],
                 slug=form.cleaned_data['slug'],
                 title=form.cleaned_data['title'],
                 gallery_start=form.cleaned_data['gallery_start'],


@@ -346,12 +346,13 @@ def chunk_add(request, slug, chunk):
                 "title": "cz. %d" % (doc.number + 1, ),
         })
 
                 "title": "cz. %d" % (doc.number + 1, ),
         })
 

-    return direct_to_template(request, "catalogue/chunk_add.html", extra_context={
+    return render(request, "catalogue/chunk_add.html", {

         "chunk": doc,
         "form": form,
     })
 
 
         "chunk": doc,
         "form": form,
     })
 
 

+@login_required

 def chunk_edit(request, slug, chunk):
     try:
         doc = Chunk.get(slug, chunk)
 def chunk_edit(request, slug, chunk):
     try:
         doc = Chunk.get(slug, chunk)


@@ -381,7 +382,7 @@ def chunk_edit(request, slug, chunk):
     else:
         go_next = ''
 
     else:
         go_next = ''
 

-    return direct_to_template(request, "catalogue/chunk_edit.html", extra_context={
+    return render(request, "catalogue/chunk_edit.html", {

         "chunk": doc,
         "form": form,
         "go_next": go_next,
         "chunk": doc,
         "form": form,
         "go_next": go_next,


@@ -389,21 +390,64 @@ def chunk_edit(request, slug, chunk):
 
 
 @transaction.commit_on_success
 
 
 @transaction.commit_on_success

+@login_required

 def chunk_mass_edit(request):
     if request.method == 'POST':
 def chunk_mass_edit(request):
     if request.method == 'POST':

-        ids = map(int, request.POST.get('ids').split(','))
+        ids = map(int, filter(lambda i: i.strip() != '', request.POST.get('ids').split(',')))

         chunks = map(lambda i: Chunk.objects.get(id=i), ids)
         chunks = map(lambda i: Chunk.objects.get(id=i), ids)

-        try:
-            stage = Chunk.tag_model.objects.get(slug=request.POST.get('stage'))
-            for c in chunks: c.stage = stage
-        except KeyError: pass
-
-        try:
-            user = User.objects.get(username=request.POST.get('user'))
-            for c in chunks: c.user = user
-        except KeyError: pass
-
-        for c in chunks: c.save()
+        
+        stage = request.POST.get('stage')
+        if stage:
+            try:
+                stage = Chunk.tag_model.objects.get(slug=stage)
+            except Chunk.DoesNotExist:
+                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
+
+        project_id = request.POST.get('project')
+        if project_id:
+            try:
+                project = Project.objects.get(pk=int(project_id))
+            except (Project.DoesNotExist, ValueError), e:
+                project = None
+            for c in chunks:
+                book = c.book
+                book.project = project
+                book.save()
+
+        for c in chunks:
+            c.save()
+
+        return HttpResponse("", content_type="text/plain")

     else:
         raise Http404
 
     else:
         raise Http404
 


@@ -422,7 +466,7 @@ def book_append(request, slug):
             return http.HttpResponseRedirect(append_to.get_absolute_url())
     else:
         form = forms.BookAppendForm(book)
             return http.HttpResponseRedirect(append_to.get_absolute_url())
     else:
         form = forms.BookAppendForm(book)

-    return direct_to_template(request, "catalogue/book_append_to.html", extra_context={
+    return render(request, "catalogue/book_append_to.html", {

         "book": book,
         "form": form,
 
         "book": book,
         "form": form,
 


@@ -441,7 +485,54 @@ def publish(request, slug):
         book.publish(request.user)
     except NotAuthorizedError:
         return http.HttpResponseRedirect(reverse('apiclient_oauth'))
         book.publish(request.user)
     except NotAuthorizedError:
         return http.HttpResponseRedirect(reverse('apiclient_oauth'))

-    except BaseException, e:
+    except ApiError, e:

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

+
+
+class GalleryMixin(object):
+    def get_directory(self):
+        return "%s%s/" % (settings.IMAGE_DIR, self.object.gallery)
+
+    @staticmethod
+    def get_object(request, slug):
+        book = get_object_or_404(Book, slug=slug)
+        if not book.gallery:
+            raise Http404
+        return book
+
+
+class GalleryView(GalleryMixin, UploadView):
+
+    def breadcrumbs(self):
+        return [
+            (u'moduły', reverse('catalogue_document_list')),
+            (self.object.title, self.object.get_absolute_url()),
+            (u'materiały',),
+        ]
+
+
+class GalleryPackageView(GalleryMixin, PackageView):
+
+    def get_redirect_url(self, slug):
+        return reverse('catalogue_book_gallery', kwargs={'slug': slug})
+
+
+@ajax(method='get')
+def lessons_for_cybernauts(request):
+    books = Book.objects.filter(for_cybernauts=True)
+    data = []
+    for book in books:
+        try:
+            changes = book.get_current_changes()
+            time_changed = max(change.created_at for change in changes)
+            xml_url = reverse('catalogue_book_xml', args=[book.slug])
+            data.append({
+                'slug': book.slug,
+                'url': xml_url,
+                'time_changed': time_changed.isoformat(),
+            })
+        except Book.NoTextError:
+            pass
+    return {'lessons': data}