pretty book descriptions and don't hide short descriptions

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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 55a2b64..cf270f2 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -43,7 +43,7 @@ class TagSubcategoryManager(models.Manager):
 
 class Tag(TagBase):
     name = models.CharField(_('name'), max_length=50, db_index=True)
 
 class Tag(TagBase):
     name = models.CharField(_('name'), max_length=50, db_index=True)

-    slug = models.SlugField(_('slug'), max_length=120, unique=True, db_index=True)
+    slug = models.SlugField(_('slug'), max_length=120, db_index=True)

     sort_key = models.SlugField(_('sort key'), max_length=120, db_index=True)
     category = models.CharField(_('category'), max_length=50, blank=False, null=False,
         db_index=True, choices=TAG_CATEGORIES)
     sort_key = models.SlugField(_('sort key'), max_length=120, db_index=True)
     category = models.CharField(_('category'), max_length=50, blank=False, null=False,
         db_index=True, choices=TAG_CATEGORIES)


@@ -56,10 +56,21 @@ class Tag(TagBase):
     gazeta_link = models.CharField(blank=True, max_length=240)
     wiki_link = models.CharField(blank=True, max_length=240)
 
     gazeta_link = models.CharField(blank=True, max_length=240)
     wiki_link = models.CharField(blank=True, max_length=240)
 

+    categories_rev = {
+        'autor': 'author',
+        'epoka': 'epoch',
+        'rodzaj': 'kind',
+        'gatunek': 'genre',
+        'motyw': 'theme',
+        'polka': 'set',
+    }
+    categories_dict = dict((item[::-1] for item in categories_rev.iteritems()))
+

     class Meta:
         ordering = ('sort_key',)
         verbose_name = _('tag')
         verbose_name_plural = _('tags')
     class Meta:
         ordering = ('sort_key',)
         verbose_name = _('tag')
         verbose_name_plural = _('tags')

+        unique_together = (("slug", "category"),)

 
     def __unicode__(self):
         return self.name
 
     def __unicode__(self):
         return self.name


@@ -69,7 +80,7 @@ class Tag(TagBase):
 
     @permalink
     def get_absolute_url(self):
 
     @permalink
     def get_absolute_url(self):

-        return ('catalogue.views.tagged_object_list', [self.slug])
+        return ('catalogue.views.tagged_object_list', [self.url_chunk])

 
     def has_description(self):
         return len(self.description) > 0
 
     def has_description(self):
         return len(self.description) > 0


@@ -90,13 +101,43 @@ class Tag(TagBase):
     @staticmethod
     def get_tag_list(tags):
         if isinstance(tags, basestring):
     @staticmethod
     def get_tag_list(tags):
         if isinstance(tags, basestring):

-            tag_slugs = tags.split('/')
-            return [Tag.objects.get(slug=slug) for slug in tag_slugs]
+            real_tags = []
+            ambiguous_slugs = []
+            category = None
+            tags_splitted = tags.split('/')
+            for index, name in enumerate(tags_splitted):
+                if name in Tag.categories_rev:
+                    category = Tag.categories_rev[name]
+                else:
+                    if category:
+                        real_tags.append(Tag.objects.get(slug=name, category=category))
+                        category = None
+                    else:
+                        try:
+                            real_tags.append(Tag.objects.exclude(category='book').get(slug=name))
+                        except Tag.MultipleObjectsReturned, e:
+                            ambiguous_slugs.append(name)
+
+            if category:
+                # something strange left off
+                raise Tag.DoesNotExist()
+            if ambiguous_slugs:
+                # some tags should be qualified
+                e = Tag.MultipleObjectsReturned()
+                e.tags = real_tags
+                e.ambiguous_slugs = ambiguous_slugs
+                raise e
+            else:
+                return real_tags

         else:
             return TagBase.get_tag_list(tags)
 
         else:
             return TagBase.get_tag_list(tags)
 

+    @property
+    def url_chunk(self):
+        return '/'.join((Tag.categories_dict[self.category], self.slug))
+

 
 

-# TODO: why is this hard-coded ? 
+# TODO: why is this hard-coded ?

 def book_upload_path(ext):
     def get_dynamic_path(book, filename):
         return 'lektura/%s.%s' % (book.slug, ext)
 def book_upload_path(ext):
     def get_dynamic_path(book, filename):
         return 'lektura/%s.%s' % (book.slug, ext)


@@ -130,9 +171,9 @@ class Book(models.Model):
     objects = models.Manager()
     tagged = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)
     objects = models.Manager()
     tagged = managers.ModelTaggedItemManager(Tag)
     tags = managers.TagDescriptor(Tag)

-    
-    _tag_counter = JSONField(editable=False, default='')
-    _theme_counter = JSONField(editable=False, default='')
+
+    _tag_counter = JSONField(null=True, editable=False)
+    _theme_counter = JSONField(null=True, editable=False)

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


@@ -148,8 +189,12 @@ class Book(models.Model):
     def save(self, force_insert=False, force_update=False, reset_short_html=True, refresh_mp3=True):
         if reset_short_html:
             # Reset _short_html during save
     def save(self, force_insert=False, force_update=False, reset_short_html=True, refresh_mp3=True):
         if reset_short_html:
             # Reset _short_html during save

+            update = {}

             for key in filter(lambda x: x.startswith('_short_html'), self.__dict__):
             for key in filter(lambda x: x.startswith('_short_html'), self.__dict__):

+                update[key] = ''

                 self.__setattr__(key, '')
                 self.__setattr__(key, '')

+            # Fragment.short_html relies on book's tags, so reset it here too
+            self.fragments.all().update(**update)

 
         book = super(Book, self).save(force_insert, force_update)
 
 
         book = super(Book, self).save(force_insert, force_update)
 


@@ -169,14 +214,13 @@ class Book(models.Model):
     @property
     def name(self):
         return self.title
     @property
     def name(self):
         return self.title

-    
+

     def book_tag(self):
         slug = ('l-' + self.slug)[:120]
     def book_tag(self):
         slug = ('l-' + self.slug)[:120]

-        book_tag, created = Tag.objects.get_or_create(slug=slug)
+        book_tag, created = Tag.objects.get_or_create(slug=slug, category='book')

         if created:
             book_tag.name = self.title[:50]
             book_tag.sort_key = slug
         if created:
             book_tag.name = self.title[:50]
             book_tag.sort_key = slug

-            book_tag.category = 'book'

             book_tag.save()
         return book_tag
 
             book_tag.save()
         return book_tag
 


@@ -289,11 +333,10 @@ class Book(models.Model):
             if category == 'author':
                 tag_sort_key = tag_name.last_name
                 tag_name = ' '.join(tag_name.first_names) + ' ' + tag_name.last_name
             if category == 'author':
                 tag_sort_key = tag_name.last_name
                 tag_name = ' '.join(tag_name.first_names) + ' ' + tag_name.last_name

-            tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name))
+            tag, created = Tag.objects.get_or_create(slug=slughifi(tag_name), category=category)

             if created:
                 tag.name = tag_name
                 tag.sort_key = slughifi(tag_sort_key)
             if created:
                 tag.name = tag_name
                 tag.sort_key = slughifi(tag_sort_key)

-                tag.category = category

                 tag.save()
             book_tags.append(tag)
 
                 tag.save()
             book_tags.append(tag)
 


@@ -345,11 +388,10 @@ class Book(models.Model):
                     continue
                 themes = []
                 for theme_name in theme_names:
                     continue
                 themes = []
                 for theme_name in theme_names:

-                    tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name))
+                    tag, created = Tag.objects.get_or_create(slug=slughifi(theme_name), category='theme')

                     if created:
                         tag.name = theme_name
                         tag.sort_key = slughifi(theme_name)
                     if created:
                         tag.name = theme_name
                         tag.sort_key = slughifi(theme_name)

-                        tag.category = 'theme'

                         tag.save()
                     themes.append(tag)
                 new_fragment.save()
                         tag.save()
                     themes.append(tag)
                 new_fragment.save()


@@ -361,8 +403,8 @@ class Book(models.Model):
 
         book.save()
         return book
 
         book.save()
         return book

-    
-    
+
+

     def refresh_tag_counter(self):
         tags = {}
         for child in self.children.all().order_by():
     def refresh_tag_counter(self):
         tags = {}
         for child in self.children.all().order_by():


@@ -373,13 +415,12 @@ class Book(models.Model):
         self.set__tag_counter_value(tags)
         self.save(reset_short_html=False, refresh_mp3=False)
         return tags
         self.set__tag_counter_value(tags)
         self.save(reset_short_html=False, refresh_mp3=False)
         return tags

-    
+

     @property
     def tag_counter(self):
     @property
     def tag_counter(self):

-        if self._tag_counter == '':
+        if self._tag_counter is None:

             return self.refresh_tag_counter()
         return dict((int(k), v) for k, v in self.get__tag_counter_value().iteritems())
             return self.refresh_tag_counter()
         return dict((int(k), v) for k, v in self.get__tag_counter_value().iteritems())

-        #return self.get__tag_counter_value()

 
     def refresh_theme_counter(self):
         tags = {}
 
     def refresh_theme_counter(self):
         tags = {}


@@ -389,14 +430,13 @@ class Book(models.Model):
         self.set__theme_counter_value(tags)
         self.save(reset_short_html=False, refresh_mp3=False)
         return tags
         self.set__theme_counter_value(tags)
         self.save(reset_short_html=False, refresh_mp3=False)
         return tags

-    
+

     @property
     def theme_counter(self):
     @property
     def theme_counter(self):

-        if self._theme_counter == '':
+        if self._theme_counter is None:

             return self.refresh_theme_counter()
         return dict((int(k), v) for k, v in self.get__theme_counter_value().iteritems())
             return self.refresh_theme_counter()
         return dict((int(k), v) for k, v in self.get__theme_counter_value().iteritems())

-        return self.get__theme_counter_value()
-    
+

 
 
 class Fragment(models.Model):
 
 
 class Fragment(models.Model):


@@ -424,11 +464,8 @@ class Fragment(models.Model):
         if short_html and len(short_html):
             return mark_safe(short_html)
         else:
         if short_html and len(short_html):
             return mark_safe(short_html)
         else:

-            book_authors = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name))
-                for tag in self.book.tags if tag.category == 'author']
-

             setattr(self, key, unicode(render_to_string('catalogue/fragment_short.html',
             setattr(self, key, unicode(render_to_string('catalogue/fragment_short.html',

-                {'fragment': self, 'book': self.book, 'book_authors': book_authors})))
+                {'fragment': self})))

             self.save()
             return mark_safe(getattr(self, key))
 
             self.save()
             return mark_safe(getattr(self, key))