Update librarian

[wolnelektury.git] / src / catalogue / models / book.py

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index 206ab73..a703c2a 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-

 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #
 # This file is part of Wolnelektury, licensed under GNU Affero GPLv3 or later.
 # Copyright © Fundacja Nowoczesna Polska. See NOTICE for more information.
 #


@@ -10,10 +9,9 @@ import re
 import urllib
 from django.conf import settings
 from django.db import connection, models, transaction
 import urllib
 from django.conf import settings
 from django.db import connection, models, transaction

-from django.db.models import permalink

 import django.dispatch
 from django.contrib.contenttypes.fields import GenericRelation
 import django.dispatch
 from django.contrib.contenttypes.fields import GenericRelation

-from django.core.urlresolvers import reverse
+from django.urls import reverse

 from django.utils.translation import ugettext_lazy as _, get_language
 from django.utils.deconstruct import deconstructible
 import jsonfield
 from django.utils.translation import ugettext_lazy as _, get_language
 from django.utils.deconstruct import deconstructible
 import jsonfield


@@ -26,11 +24,11 @@ from newtagging import managers
 from catalogue import constants
 from catalogue.fields import EbookField
 from catalogue.models import Tag, Fragment, BookMedia
 from catalogue import constants
 from catalogue.fields import EbookField
 from catalogue.models import Tag, Fragment, BookMedia

-from catalogue.utils import create_zip, gallery_url, gallery_path, split_tags
+from catalogue.utils import create_zip, gallery_url, gallery_path, split_tags, get_random_hash

 from catalogue.models.tag import prefetched_relations
 from catalogue import app_settings
 from catalogue import tasks
 from catalogue.models.tag import prefetched_relations
 from catalogue import app_settings
 from catalogue import tasks

-from wolnelektury.utils import makedirs
+from wolnelektury.utils import makedirs, cached_render, clear_cached_renders

 
 bofh_storage = BofhFileSystemStorage()
 
 
 bofh_storage = BofhFileSystemStorage()
 


@@ -76,6 +74,7 @@ class Book(models.Model):
     audio_length = models.CharField(_('audio length'), blank=True, max_length=8)
     preview = models.BooleanField(_('preview'), default=False)
     preview_until = models.DateField(_('preview until'), blank=True, null=True)
     audio_length = models.CharField(_('audio length'), blank=True, max_length=8)
     preview = models.BooleanField(_('preview'), default=False)
     preview_until = models.DateField(_('preview until'), blank=True, null=True)

+    preview_key = models.CharField(max_length=32, blank=True, null=True)

 
     # files generated during publication
     cover = EbookField(
 
     # files generated during publication
     cover = EbookField(


@@ -102,7 +101,7 @@ class Book(models.Model):
     ebook_formats = constants.EBOOK_FORMATS
     formats = ebook_formats + ['html', 'xml']
 
     ebook_formats = constants.EBOOK_FORMATS
     formats = ebook_formats + ['html', 'xml']
 

-    parent = models.ForeignKey('self', blank=True, null=True, related_name='children')
+    parent = models.ForeignKey('self', models.CASCADE, blank=True, null=True, related_name='children')

     ancestor = models.ManyToManyField('self', blank=True, editable=False, related_name='descendant', symmetrical=False)
 
     cached_author = models.CharField(blank=True, max_length=240, db_index=True)
     ancestor = models.ManyToManyField('self', blank=True, editable=False, related_name='descendant', symmetrical=False)
 
     cached_author = models.CharField(blank=True, max_length=240, db_index=True)


@@ -199,13 +198,15 @@ class Book(models.Model):
         self.cached_author = self.tag_unicode('author')
         self.has_audience = 'audience' in self.extra_info
 
         self.cached_author = self.tag_unicode('author')
         self.has_audience = 'audience' in self.extra_info
 

+        if self.preview and not self.preview_key:
+            self.preview_key = get_random_hash(self.slug)[:32]
+

         ret = super(Book, self).save(force_insert, force_update, **kwargs)
 
         return ret
 
         ret = super(Book, self).save(force_insert, force_update, **kwargs)
 
         return ret
 

-    @permalink

     def get_absolute_url(self):
     def get_absolute_url(self):

-        return 'book_detail', [self.slug]
+        return reverse('book_detail', args=[self.slug])

 
     def gallery_path(self):
         return gallery_path(self.slug)
 
     def gallery_path(self):
         return gallery_path(self.slug)


@@ -284,7 +285,7 @@ class Book(models.Model):
         media = self.get_media(format_)
         if media:
             if self.preview:
         media = self.get_media(format_)
         if media:
             if self.preview:

-                return reverse('embargo_link', kwargs={'slug': self.slug, 'format_': format_})
+                return reverse('embargo_link', kwargs={'key': self.preview_key, 'slug': self.slug, 'format_': format_})

             else:
                 return media.url
         else:
             else:
                 return media.url
         else:


@@ -592,6 +593,8 @@ class Book(models.Model):
                     parent = parent.parent
 
     def flush_includes(self, languages=True):
                     parent = parent.parent
 
     def flush_includes(self, languages=True):

+        clear_cached_renders(self.mini_box)
+        clear_cached_renders(self.mini_box_nolink)

         if not languages:
             return
         if languages is True:
         if not languages:
             return
         if languages is True:


@@ -599,8 +602,6 @@ class Book(models.Model):
         flush_ssi_includes([
             template % (self.pk, lang)
             for template in [
         flush_ssi_includes([
             template % (self.pk, lang)
             for template in [

-                '/katalog/b/%d/mini.%s.html',
-                '/katalog/b/%d/mini_nolink.%s.html',

                 '/katalog/b/%d/short.%s.html',
                 '/katalog/b/%d/wide.%s.html',
                 '/api/include/book/%d.%s.json',
                 '/katalog/b/%d/short.%s.html',
                 '/katalog/b/%d/wide.%s.html',
                 '/api/include/book/%d.%s.json',


@@ -697,7 +698,7 @@ class Book(models.Model):
         """
 
         books_by_parent = {}
         """
 
         books_by_parent = {}

-        books = cls.objects.order_by('parent_number', 'sort_key').only('title', 'parent', 'slug')
+        books = cls.objects.order_by('parent_number', 'sort_key').only('title', 'parent', 'slug', 'extra_info')

         if book_filter:
             books = books.filter(book_filter).distinct()
 
         if book_filter:
             books = books.filter(book_filter).distinct()
 


@@ -802,6 +803,18 @@ class Book(models.Model):
     def cover_color(self):
         return WLCover.epoch_colors.get(self.extra_info.get('epoch'), '#000000')
 
     def cover_color(self):
         return WLCover.epoch_colors.get(self.extra_info.get('epoch'), '#000000')
 

+    @cached_render('catalogue/book_mini_box.html')
+    def mini_box(self):
+        return {
+            'book': self
+        }
+
+    @cached_render('catalogue/book_mini_box.html')
+    def mini_box_nolink(self):
+        return {
+            'book': self,
+            'no_link': True,
+        }

 
 def add_file_fields():
     for format_ in Book.formats:
 
 def add_file_fields():
     for format_ in Book.formats:


@@ -825,5 +838,5 @@ add_file_fields()
 
 
 class BookPopularity(models.Model):
 
 
 class BookPopularity(models.Model):

-    book = models.OneToOneField(Book, related_name='popularity')
+    book = models.OneToOneField(Book, models.CASCADE, related_name='popularity')

     count = models.IntegerField(default=0, db_index=True)
     count = models.IntegerField(default=0, db_index=True)