Added missing BookImportForm to catalogue.forms.

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

diff --git a/apps/catalogue/views.py b/apps/catalogue/views.py
index a2bd34f..b61d5e8 100644 (file)
--- a/apps/catalogue/views.py
+++ b/apps/catalogue/views.py
@@ -7,7 +7,7 @@ from django.shortcuts import render_to_response, get_object_or_404
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.core.urlresolvers import reverse
 from django.db.models import Q

-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, user_passes_test

 from django.utils.datastructures import SortedDict
 from django.views.decorators.http import require_POST
 from django.contrib import auth
 from django.utils.datastructures import SortedDict
 from django.views.decorators.http import require_POST
 from django.contrib import auth


@@ -16,7 +16,6 @@ from django.utils import simplejson
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
 from django.views.decorators import cache
 from django.utils.functional import Promise
 from django.utils.encoding import force_unicode
 from django.views.decorators import cache

-from django.core.servers.basehttp import FileWrapper

 
 from catalogue import models
 from catalogue import forms
 
 from catalogue import models
 from catalogue import forms


@@ -24,6 +23,9 @@ from catalogue.utils import split_tags
 from newtagging import views as newtagging_views
 
 
 from newtagging import views as newtagging_views
 
 

+staff_required = user_passes_test(lambda user: user.is_staff)
+
+

 class LazyEncoder(simplejson.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, Promise):
 class LazyEncoder(simplejson.JSONEncoder):
     def default(self, obj):
         if isinstance(obj, Promise):


@@ -31,7 +33,6 @@ class LazyEncoder(simplejson.JSONEncoder):
         return obj
 
 
         return obj
 
 

-@cache.cache_control(must_revalidate=True, max_age=3600)

 def main_page(request):    
     if request.user.is_authenticated():
         shelves = models.Tag.objects.filter(category='set', user=request.user)
 def main_page(request):    
     if request.user.is_authenticated():
         shelves = models.Tag.objects.filter(category='set', user=request.user)


@@ -59,7 +60,6 @@ def book_list(request):
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

-@cache.cache_control(must_revalidate=True, max_age=3600)

 def tagged_object_list(request, tags=''):
     # Prevent DoS attacks on our database
     if len(tags.split('/')) > 6:
 def tagged_object_list(request, tags=''):
     # Prevent DoS attacks on our database
     if len(tags.split('/')) > 6:


@@ -70,17 +70,23 @@ def tagged_object_list(request, tags=''):
     except models.Tag.DoesNotExist:
         raise Http404
     
     except models.Tag.DoesNotExist:
         raise Http404
     

+    if len([tag for tag in tags if tag.category == 'book']):
+        raise Http404
+    

     model = models.Book
     model = models.Book

+    shelf = [tag for tag in tags if tag.category == 'set']

     shelf_is_set = (len(tags) == 1 and tags[0].category == 'set')
     theme_is_set = len([tag for tag in tags if tag.category == 'theme']) > 0
     if theme_is_set:
         model = models.Fragment
 
     shelf_is_set = (len(tags) == 1 and tags[0].category == 'set')
     theme_is_set = len([tag for tag in tags if tag.category == 'theme']) > 0
     if theme_is_set:
         model = models.Fragment
 

-    extra_where = 'NOT catalogue_tag.category = "set"'
+    user_is_owner = (len(shelf) and request.user.is_authenticated() and request.user == shelf[0].user)
+    
+    extra_where = 'catalogue_tag.category NOT IN ("set", "book")'

     related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
 
     related_tags = models.Tag.objects.related_for_model(tags, model, counts=True, extra={'where': [extra_where]})
     categories = split_tags(related_tags)
 

-    if not theme_is_set:
+    if not (theme_is_set or shelf_is_set):

         model=models.Book.objects.filter(parent=None)
     
     return newtagging_views.tagged_object_list(
         model=models.Book.objects.filter(parent=None)
     
     return newtagging_views.tagged_object_list(


@@ -89,15 +95,30 @@ def tagged_object_list(request, tags=''):
         queryset_or_model=model,
         tags=tags,
         template_name='catalogue/tagged_object_list.html',
         queryset_or_model=model,
         tags=tags,
         template_name='catalogue/tagged_object_list.html',

-        extra_context = {'categories': categories, 'shelf_is_set': shelf_is_set },
+        extra_context = {'categories': categories, 'shelf_is_set': shelf_is_set, 'user_is_owner': user_is_owner },

     )
 
 
     )
 
 

+def book_fragments(request, book_slug, theme_slug):
+    book = get_object_or_404(models.Book, slug=book_slug)
+    book_tag = get_object_or_404(models.Tag, slug='l-' + book_slug)
+    theme = get_object_or_404(models.Tag, slug=theme_slug)
+    fragments = models.Fragment.tagged.with_all([book_tag, theme])
+    
+    form = forms.SearchForm()
+    return render_to_response('catalogue/book_fragments.html', locals(),
+        context_instance=RequestContext(request))
+
+

 def book_detail(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
 def book_detail(request, slug):
     book = get_object_or_404(models.Book, slug=slug)

+    book_tag = get_object_or_404(models.Tag, slug = 'l-' + slug)

     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
     book_children = book.children.all().order_by('parent_number')
     tags = list(book.tags.filter(~Q(category='set')))
     categories = split_tags(tags)
     book_children = book.children.all().order_by('parent_number')

+    extra_where = 'catalogue_tag.category = "theme"'
+    book_themes = models.Tag.objects.related_for_model(book_tag, models.Fragment, counts=True, extra={'where': [extra_where]})
+    extra_info = book.get_extra_info_value()

     
     form = forms.SearchForm()
     return render_to_response('catalogue/book_detail.html', locals(),
     
     form = forms.SearchForm()
     return render_to_response('catalogue/book_detail.html', locals(),


@@ -120,47 +141,49 @@ def book_text(request, slug):
 # ==========
 # = Search =
 # ==========
 # ==========
 # = Search =
 # ==========

-def search(request):
-    query = request.GET.get('q', '')
-    tags = request.GET.get('tags', '')
-    if tags == '':
-        tags = []
-
-    try:
-        tag_list = models.Tag.get_tag_list(tags)
-        tag = models.Tag.objects.get(name=query)
-    except models.Tag.DoesNotExist:
-        try:
-            book = models.Book.objects.get(title=query)
-            return HttpResponseRedirect(book.get_absolute_url())
-        except models.Book.DoesNotExist:
-            return HttpResponseRedirect(reverse('catalogue.views.main_page'))
+def _tags_starting_with(prefix, user):
+    books = models.Book.objects.filter(title__icontains=prefix)
+    tags = models.Tag.objects.filter(name__icontains=prefix)
+    if user.is_authenticated():
+        tags = tags.filter(~Q(category='book') & (~Q(category='set') | Q(user=user)))

     else:
     else:

-        tag_list.append(tag)
-        return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', 
-            kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
-        ))
+        tags = tags.filter(~Q(category='book') & ~Q(category='set'))

 
 

+    return list(books) + list(tags)
+        

 
 

-def tags_starting_with(request):
+def search(request):
+    tags = request.GET.get('tags', '')
+    prefix = request.GET.get('q', '')
+    # Prefix must have at least 2 characters
+    if len(prefix) < 2:
+        return HttpResponse('')
+    

     try:
     try:

-        prefix = request.GET['q']
-        if len(prefix) < 2:
-            raise KeyError
-
-        books = models.Book.objects.filter(title__icontains=prefix)
-        tags = models.Tag.objects.filter(name__icontains=prefix)
-        if request.user.is_authenticated():
-            tags = tags.filter(~Q(category='set') | Q(user=request.user))
+        tag_list = models.Tag.get_tag_list(tags)
+    except:
+        tag_list = []
+    
+    result = _tags_starting_with(prefix, request.user)
+    if len(result) > 0:
+        tag = result[0]
+        if isinstance(tag, models.Book):
+            return HttpResponseRedirect(tag.get_absolute_url())

         else:
         else:

-            tags = tags.filter(~Q(category='set'))
-
-        completions = [book.title for book in books] + [tag.name for tag in tags]
+            tag_list.append(tag)
+        
+    return HttpResponseRedirect(reverse('catalogue.views.tagged_object_list', 
+        kwargs={'tags': '/'.join(tag.slug for tag in tag_list)}
+    ))

 
 

-        return HttpResponse('\n'.join(completions))    

 
 

-    except KeyError:
+def tags_starting_with(request):
+    prefix = request.GET.get('q', '')
+    # Prefix must have at least 2 characters
+    if len(prefix) < 2:

         return HttpResponse('')
         return HttpResponse('')

+    
+    return HttpResponse('\n'.join(tag.name for tag in _tags_starting_with(prefix, request.user)))

 
 
 # ====================
 
 
 # ====================


@@ -174,7 +197,6 @@ def user_shelves(request):
     return render_to_response('catalogue/user_shelves.html', locals(),
             context_instance=RequestContext(request))
 
     return render_to_response('catalogue/user_shelves.html', locals(),
             context_instance=RequestContext(request))
 

-

 @cache.never_cache
 def book_sets(request, slug):
     book = get_object_or_404(models.Book, slug=slug)
 @cache.never_cache
 def book_sets(request, slug):
     book = get_object_or_404(models.Book, slug=slug)


@@ -187,8 +209,18 @@ def book_sets(request, slug):
     if request.method == 'POST':
         form = forms.ObjectSetsForm(book, request.user, request.POST)
         if form.is_valid():
     if request.method == 'POST':
         form = forms.ObjectSetsForm(book, request.user, request.POST)
         if form.is_valid():

-            book.tags = ([models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']] +
-                list(book.tags.filter(~Q(category='set') | ~Q(user=request.user))))
+            old_shelves = list(book.tags.filter(category='set'))
+            new_shelves = [models.Tag.objects.get(pk=id) for id in form.cleaned_data['set_ids']]
+            
+            for shelf in [shelf for shelf in old_shelves if shelf not in new_shelves]:
+                shelf.book_count -= 1
+                shelf.save()
+                
+            for shelf in [shelf for shelf in new_shelves if shelf not in old_shelves]:
+                shelf.book_count += 1
+                shelf.save()
+            
+            book.tags = new_shelves + list(book.tags.filter(~Q(category='set') | ~Q(user=request.user)))

             if request.is_ajax():
                 return HttpResponse('<p>Półki zostały zapisane.</p>')
             else:
             if request.is_ajax():
                 return HttpResponse('<p>Półki zostały zapisane.</p>')
             else:


@@ -201,6 +233,21 @@ def book_sets(request, slug):
         context_instance=RequestContext(request))
 
 
         context_instance=RequestContext(request))
 
 

+@login_required
+@require_POST
+@cache.never_cache
+def remove_from_shelf(request, shelf, book):
+    book = get_object_or_404(models.Book, slug=book)
+    shelf = get_object_or_404(models.Tag, slug=shelf, category='set', user=request.user)
+    
+    models.Tag.objects.remove_tag(book, shelf)
+    
+    shelf.book_count -= 1
+    shelf.save()
+    
+    return HttpResponse('Usunieto')
+
+

 @cache.never_cache
 def download_shelf(request, slug):
     """"
 @cache.never_cache
 def download_shelf(request, slug):
     """"


@@ -213,7 +260,18 @@ def download_shelf(request, slug):
     # Create a ZIP archive
     temp = temp = tempfile.TemporaryFile()
     archive = zipfile.ZipFile(temp, 'w')
     # Create a ZIP archive
     temp = temp = tempfile.TemporaryFile()
     archive = zipfile.ZipFile(temp, 'w')

-    for book in models.Book.tagged.with_all(shelf):
+    
+    # Collect all books to include in ZIP archive
+    def collect_books(books):
+        result = []
+        for book in books:
+            if len(book.children.all()) == 0:
+                result.append(book)
+            else:
+                result += collect_books(book.children.all())
+        return result
+    
+    for book in collect_books(models.Book.tagged.with_all(shelf)):

         if book.pdf_file:
             filename = book.pdf_file.path
             archive.write(filename, str('%s.pdf' % book.slug))
         if book.pdf_file:
             filename = book.pdf_file.path
             archive.write(filename, str('%s.pdf' % book.slug))


@@ -247,8 +305,7 @@ def new_set(request):
         else:
             return HttpResponseRedirect('/')
 
         else:
             return HttpResponseRedirect('/')
 

-    return render_to_response('catalogue/book_sets.html', locals(),
-            context_instance=RequestContext(request))
+    return HttpResponseRedirect('/')

 
 
 @login_required
 
 
 @login_required


@@ -301,3 +358,21 @@ def logout_then_redirect(request):
     auth.logout(request)
     return HttpResponseRedirect(request.GET.get('next', '/'))
 
     auth.logout(request)
     return HttpResponseRedirect(request.GET.get('next', '/'))
 

+
+
+# =========
+# = Admin =
+# =========
+@login_required
+@staff_required
+def import_book(request):
+    """docstring for import_book"""
+    book_import_form = forms.BookImportForm(request.POST, request.FILES)
+    if book_import_form.is_valid():
+        # try:
+        book_import_form.save()
+        # except:
+            # return HttpResponse("Error importing book: %r" % (sys.exc_info(),))
+        return HttpResponse("Book imported successfully")
+    else:
+        return HttpResponse("Error importing file: %r" % book_import_form.errors)
\ No newline at end of file