counter fixes

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

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 95d3da1..ead5ba0 100644 (file)
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -6,6 +6,7 @@ from datetime import datetime
 
 from django.db import models
 from django.db.models import permalink, Q
 
 from django.db import models
 from django.db.models import permalink, Q

+import django.dispatch

 from django.core.cache import cache
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User


@@ -47,6 +48,9 @@ MEDIA_FORMATS = (
     ('daisy', _('DAISY file')), 
 )
 
     ('daisy', _('DAISY file')), 
 )
 

+# not quite, but Django wants you to set a timeout
+CACHE_FOREVER = 2419200  # 28 days
+

 class TagSubcategoryManager(models.Manager):
     def __init__(self, subcategory):
         super(TagSubcategoryManager, self).__init__()
 class TagSubcategoryManager(models.Manager):
     def __init__(self, subcategory):
         super(TagSubcategoryManager, self).__init__()


@@ -299,6 +303,8 @@ class Book(models.Model):
     tagged   = managers.ModelTaggedItemManager(Tag)
     tags     = managers.TagDescriptor(Tag)
 
     tagged   = managers.ModelTaggedItemManager(Tag)
     tags     = managers.TagDescriptor(Tag)
 

+    html_built = django.dispatch.Signal()
+

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


@@ -313,10 +319,12 @@ class Book(models.Model):
     def save(self, force_insert=False, force_update=False, reset_short_html=True, **kwargs):
         self.sort_key = sortify(self.title)
 
     def save(self, force_insert=False, force_update=False, reset_short_html=True, **kwargs):
         self.sort_key = sortify(self.title)
 

+        ret = super(Book, self).save(force_insert, force_update)
+

         if reset_short_html:
             self.reset_short_html()
 
         if reset_short_html:
             self.reset_short_html()
 

-        return super(Book, self).save(force_insert, force_update)
+        return ret

 
     @permalink
     def get_absolute_url(self):
 
     @permalink
     def get_absolute_url(self):


@@ -440,7 +448,7 @@ class Book(models.Model):
                 {'book': self, 'tags': tags, 'formats': formats}))
 
             if self.id:
                 {'book': self, 'tags': tags, 'formats': formats}))
 
             if self.id:

-                cache.set(cache_key, short_html)
+                cache.set(cache_key, short_html, CACHE_FOREVER)

             return mark_safe(short_html)
 
     @property
             return mark_safe(short_html)
 
     @property


@@ -606,6 +614,7 @@ class Book(models.Model):
                 new_fragment.save()
                 new_fragment.tags = set(meta_tags + themes + [book_tag] + ancestor_tags)
             self.save()
                 new_fragment.save()
                 new_fragment.tags = set(meta_tags + themes + [book_tag] + ancestor_tags)
             self.save()

+            self.html_built.send(sender=self)

             return True
         return False
 
             return True
         return False
 


@@ -708,11 +717,12 @@ class Book(models.Model):
                 fragment.tags = set(list(fragment.tags) + [book_tag])
             book_descendants += list(child_book.children.all())
 
                 fragment.tags = set(list(fragment.tags) + [book_tag])
             book_descendants += list(child_book.children.all())
 

+        book.save()
+

         # refresh cache
         book.reset_tag_counter()
         book.reset_theme_counter()
 
         # refresh cache
         book.reset_tag_counter()
         book.reset_theme_counter()
 

-        book.save()

         return book
 
     def reset_tag_counter(self):
         return book
 
     def reset_tag_counter(self):


@@ -741,7 +751,7 @@ class Book(models.Model):
                 tags[tag.pk] = 1
 
             if self.id:
                 tags[tag.pk] = 1
 
             if self.id:

-                cache.set(cache_key, tags)
+                cache.set(cache_key, tags, CACHE_FOREVER)

         return tags
 
     def reset_theme_counter(self):
         return tags
 
     def reset_theme_counter(self):


@@ -768,7 +778,7 @@ class Book(models.Model):
                     tags[tag.pk] = tags.get(tag.pk, 0) + 1
 
             if self.id:
                     tags[tag.pk] = tags.get(tag.pk, 0) + 1
 
             if self.id:

-                cache.set(cache_key, tags)
+                cache.set(cache_key, tags, CACHE_FOREVER)

         return tags
 
     def pretty_title(self, html_links=False):
         return tags
 
     def pretty_title(self, html_links=False):


@@ -846,7 +856,7 @@ class Fragment(models.Model):
             short_html = unicode(render_to_string('catalogue/fragment_short.html',
                 {'fragment': self}))
             if self.id:
             short_html = unicode(render_to_string('catalogue/fragment_short.html',
                 {'fragment': self}))
             if self.id:

-                cache.set(cache_key, short_html)
+                cache.set(cache_key, short_html, CACHE_FOREVER)

             return mark_safe(short_html)
 
 
             return mark_safe(short_html)