Minor fix: mark_safe in template tag for headers.

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

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
index 6e6c50f..c0d47f9 100644 (file)
--- a/src/catalogue/models/book.py
+++ b/src/catalogue/models/book.py
@@ -20,6 +20,7 @@ import jsonfield
 from fnpdjango.storage import BofhFileSystemStorage
 from ssify import flush_ssi_includes
 
 from fnpdjango.storage import BofhFileSystemStorage
 from ssify import flush_ssi_includes
 

+from librarian.cover import WLCover

 from librarian.html import transform_abstrakt
 from newtagging import managers
 from catalogue import constants
 from librarian.html import transform_abstrakt
 from newtagging import managers
 from catalogue import constants


@@ -115,6 +116,8 @@ class Book(models.Model):
     html_built = django.dispatch.Signal()
     published = django.dispatch.Signal()
 
     html_built = django.dispatch.Signal()
     published = django.dispatch.Signal()
 

+    SORT_KEY_SEP = '$'
+

     class AlreadyExists(Exception):
         pass
 
     class AlreadyExists(Exception):
         pass
 


@@ -124,7 +127,7 @@ class Book(models.Model):
         verbose_name_plural = _('books')
         app_label = 'catalogue'
 
         verbose_name_plural = _('books')
         app_label = 'catalogue'
 

-    def __unicode__(self):
+    def __str__(self):

         return self.title
 
     def get_initial(self):
         return self.title
 
     def get_initial(self):


@@ -136,6 +139,15 @@ class Book(models.Model):
     def authors(self):
         return self.tags.filter(category='author')
 
     def authors(self):
         return self.tags.filter(category='author')
 

+    def epochs(self):
+        return self.tags.filter(category='epoch')
+
+    def genres(self):
+        return self.tags.filter(category='genre')
+
+    def kinds(self):
+        return self.tags.filter(category='kind')
+

     def tag_unicode(self, category):
         relations = prefetched_relations(self, category)
         if relations:
     def tag_unicode(self, category):
         relations = prefetched_relations(self, category)
         if relations:


@@ -149,6 +161,15 @@ class Book(models.Model):
     def author_unicode(self):
         return self.cached_author
 
     def author_unicode(self):
         return self.cached_author
 

+    def kind_unicode(self):
+        return self.tag_unicode('kind')
+
+    def epoch_unicode(self):
+        return self.tag_unicode('epoch')
+
+    def genre_unicode(self):
+        return self.tag_unicode('genre')
+

     def translator(self):
         translators = self.extra_info.get('translators')
         if not translators:
     def translator(self):
         translators = self.extra_info.get('translators')
         if not translators:


@@ -167,7 +188,7 @@ class Book(models.Model):
         from sortify import sortify
 
         self.sort_key = sortify(self.title)[:120]
         from sortify import sortify
 
         self.sort_key = sortify(self.title)[:120]

-        self.title = unicode(self.title)  # ???
+        self.title = str(self.title)  # ???

 
         try:
             author = self.authors().first().sort_key
 
         try:
             author = self.authors().first().sort_key


@@ -184,12 +205,7 @@ class Book(models.Model):
 
     @permalink
     def get_absolute_url(self):
 
     @permalink
     def get_absolute_url(self):

-        return 'catalogue.views.book_detail', [self.slug]
-
-    @staticmethod
-    @permalink
-    def create_url(slug):
-        return 'catalogue.views.book_detail', [slug]
+        return 'book_detail', [self.slug]

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


@@ -385,7 +401,7 @@ class Book(models.Model):
                 index.index_tags()
             if commit:
                 index.index.commit()
                 index.index_tags()
             if commit:
                 index.index.commit()

-        except Exception, e:
+        except Exception as e:

             index.index.rollback()
             raise e
 
             index.index.rollback()
             raise e
 


@@ -656,7 +672,7 @@ class Book(models.Model):
 
     def publisher(self):
         publisher = self.extra_info['publisher']
 
     def publisher(self):
         publisher = self.extra_info['publisher']

-        if isinstance(publisher, basestring):
+        if isinstance(publisher, str):

             return publisher
         elif isinstance(publisher, list):
             return ', '.join(publisher)
             return publisher
         elif isinstance(publisher, list):
             return ', '.join(publisher)


@@ -681,7 +697,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()
 


@@ -780,6 +796,12 @@ class Book(models.Model):
         if likes(user, self):
             set_sets(user, self, [])
 
         if likes(user, self):
             set_sets(user, self, [])
 

+    def full_sort_key(self):
+        return self.SORT_KEY_SEP.join((self.sort_key_author, self.sort_key, str(self.id)))
+
+    def cover_color(self):
+        return WLCover.epoch_colors.get(self.extra_info.get('epoch'), '#000000')
+

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