X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ce9b29777e9dc6d8d285a18d5aa8f75905b0a229..b1a76c6c9fe9f4fd4b9a47d3c4405b6484130977:/apps/catalogue/models.py

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index bf724fdd0..d0a620a96 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -47,6 +47,9 @@ MEDIA_FORMATS = (
     ('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__()
@@ -313,10 +316,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)
 
+        ret = super(Book, self).save(force_insert, force_update)
+
         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):
@@ -397,6 +402,9 @@ class Book(models.Model):
         return self.get_media("daisy")                       
 
     def reset_short_html(self):
+        if self.id is None:
+            return
+
         cache_key = "Book.short_html/%d/%s"
         for lang, langname in settings.LANGUAGES:
             cache.delete(cache_key % (self.id, lang))
@@ -405,14 +413,15 @@ class Book(models.Model):
             fragm.reset_short_html()
 
     def short_html(self):
-        cache_key = "Book.short_html/%d/%s" % (self.id, get_language())
-        short_html = cache.get(cache_key)
+        if self.id:
+            cache_key = "Book.short_html/%d/%s" % (self.id, get_language())
+            short_html = cache.get(cache_key)
+        else:
+            short_html = None
 
         if short_html is not None:
-            print 'b.s from cache'
             return mark_safe(short_html)
         else:
-            print 'b.s manual'
             tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
             tags = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name)) for tag in tags]
 
@@ -434,7 +443,9 @@ class Book(models.Model):
 
             short_html = unicode(render_to_string('catalogue/book_short.html',
                 {'book': self, 'tags': tags, 'formats': formats}))
-            cache.set(cache_key, short_html)
+
+            if self.id:
+                cache.set(cache_key, short_html, CACHE_FOREVER)
             return mark_safe(short_html)
 
     @property
@@ -702,14 +713,18 @@ class Book(models.Model):
                 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()
 
-        book.save()
         return book
 
     def reset_tag_counter(self):
+        if self.id is None:
+            return
+
         cache_key = "Book.tag_counter/%d" % self.id
         cache.delete(cache_key)
         if self.parent:
@@ -717,11 +732,13 @@ class Book(models.Model):
 
     @property
     def tag_counter(self):
-        cache_key = "Book.tag_counter/%d" % self.id
-        tags = cache.get(cache_key)
-        print 'tag'
+        if self.id:
+            cache_key = "Book.tag_counter/%d" % self.id
+            tags = cache.get(cache_key)
+        else:
+            tags = None
+
         if tags is None:
-            print 'tag manual'
             tags = {}
             for child in self.children.all().order_by():
                 for tag_pk, value in child.tag_counter.iteritems():
@@ -729,10 +746,14 @@ class Book(models.Model):
             for tag in self.tags.exclude(category__in=('book', 'theme', 'set')).order_by():
                 tags[tag.pk] = 1
 
-            cache.set(cache_key, tags)
+            if self.id:
+                cache.set(cache_key, tags, CACHE_FOREVER)
         return tags
 
     def reset_theme_counter(self):
+        if self.id is None:
+            return
+
         cache_key = "Book.theme_counter/%d" % self.id
         cache.delete(cache_key)
         if self.parent:
@@ -740,17 +761,20 @@ class Book(models.Model):
 
     @property
     def theme_counter(self):
-        cache_key = "Book.theme_counter/%d" % self.id
-        tags = cache.get(cache_key)
-        print 'theme'
+        if self.id:
+            cache_key = "Book.theme_counter/%d" % self.id
+            tags = cache.get(cache_key)
+        else:
+            tags = None
+
         if tags is None:
-            print 'theme manual'
             tags = {}
             for fragment in Fragment.tagged.with_any([self.book_tag()]).order_by():
                 for tag in fragment.tags.filter(category='theme').order_by():
                     tags[tag.pk] = tags.get(tag.pk, 0) + 1
 
-            cache.set(cache_key, tags)
+            if self.id:
+                cache.set(cache_key, tags, CACHE_FOREVER)
         return tags
 
     def pretty_title(self, html_links=False):
@@ -808,22 +832,27 @@ class Fragment(models.Model):
         return '%s#m%s' % (reverse('book_text', kwargs={'slug': self.book.slug}), self.anchor)
 
     def reset_short_html(self):
+        if self.id is None:
+            return
+
         cache_key = "Fragment.short_html/%d/%s"
         for lang, langname in settings.LANGUAGES:
             cache.delete(cache_key % (self.id, lang))
 
     def short_html(self):
-        cache_key = "Fragment.short_html/%d/%s" % (self.id, get_language())
-        short_html = cache.get(cache_key)
+        if self.id:
+            cache_key = "Fragment.short_html/%d/%s" % (self.id, get_language())
+            short_html = cache.get(cache_key)
+        else:
+            short_html = None
 
         if short_html is not None:
-            print 'f.s from cache'
             return mark_safe(short_html)
         else:
-            print 'f.s manual'
             short_html = unicode(render_to_string('catalogue/fragment_short.html',
                 {'fragment': self}))
-            cache.set(cache_key, short_html)
+            if self.id:
+                cache.set(cache_key, short_html, CACHE_FOREVER)
             return mark_safe(short_html)