fix in librarian

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

diff --git a/apps/lesmianator/models.py b/apps/lesmianator/models.py
index 1b53efd..5db02c2 100644 (file)
--- a/apps/lesmianator/models.py
+++ b/apps/lesmianator/models.py
@@ -9,16 +9,15 @@ from StringIO import StringIO
 
 from django.core.files.base import ContentFile
 from django.db import models
 
 from django.core.files.base import ContentFile
 from django.db import models

-from django.db.models import permalink
+from django.utils.timezone import utc

 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext_lazy as _
 from django.core.urlresolvers import reverse

-from django.db.models.signals import m2m_changed

 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.models import User
 from django.contrib.contenttypes.models import ContentType

-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey

 from django.conf import settings
 
 from django.conf import settings
 

-from catalogue.fields import JSONField
+from jsonfield import JSONField

 from catalogue.models import Book, Tag
 
 
 from catalogue.models import Book, Tag
 
 


@@ -40,7 +39,7 @@ class Poem(models.Model):
 
     def visit(self):
         self.view_count += 1
 
     def visit(self):
         self.view_count += 1

-        self.seen_at = datetime.now()
+        self.seen_at = datetime.utcnow().replace(tzinfo=utc)

         self.save()
 
     def __unicode__(self):
         self.save()
 
     def __unicode__(self):


@@ -104,7 +103,7 @@ class Continuations(models.Model):
     pickle = models.FileField(_('Continuations file'), upload_to='lesmianator')
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
     pickle = models.FileField(_('Continuations file'), upload_to='lesmianator')
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()

-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')

 
     class Meta:
         unique_together = (('content_type', 'object_id'), )
 
     class Meta:
         unique_together = (('content_type', 'object_id'), )


@@ -137,20 +136,14 @@ class Continuations(models.Model):
             mydict[letter] += 1
             last_word = last_word[-length+1:] + letter
         # add children
             mydict[letter] += 1
             last_word = last_word[-length+1:] + letter
         # add children

-        return reduce(cls.join_conts, 
-                      (cls.get(child) for child in book.children.all()),
+        return reduce(cls.join_conts,
+                      (cls.get(child) for child in book.children.all().iterator()),

                       conts)
 
     @classmethod
     def for_set(cls, tag):
                       conts)
 
     @classmethod
     def for_set(cls, tag):

-        # book contains its descendants, we don't want them twice
-        books = Book.tagged.with_any((tag,))
-        l_tags = Tag.objects.filter(category='book', slug__in=[book.book_tag_slug() for book in books])
-        descendants_keys = [book.pk for book in Book.tagged.with_any(l_tags)]
-        if descendants_keys:
-            books = books.exclude(pk__in=descendants_keys)
-
-        cont_tabs = (cls.get(b) for b in books)
+        books = Book.tagged_top_level([tag])
+        cont_tabs = (cls.get(b) for b in books.iterator())

         return reduce(cls.join_conts, cont_tabs)
 
     @classmethod
         return reduce(cls.join_conts, cont_tabs)
 
     @classmethod


@@ -158,7 +151,7 @@ class Continuations(models.Model):
         object_type = ContentType.objects.get_for_model(sth)
         should_keys = set([sth.id])
         if isinstance(sth, Tag):
         object_type = ContentType.objects.get_for_model(sth)
         should_keys = set([sth.id])
         if isinstance(sth, Tag):

-            should_keys = set(b.pk for b in Book.tagged.with_any((sth,)))
+            should_keys = set(b.pk for b in Book.tagged.with_any((sth,)).iterator())

         try:
             obj = cls.objects.get(content_type=object_type, object_id=sth.id)
             if not obj.pickle:
         try:
             obj = cls.objects.get(content_type=object_type, object_id=sth.id)
             if not obj.pickle:


@@ -175,7 +168,7 @@ class Continuations(models.Model):
             elif isinstance(sth, Tag):
                 conts = cls.for_set(sth)
             else:
             elif isinstance(sth, Tag):
                 conts = cls.for_set(sth)
             else:

-                raise NotImplemented('Lesmianator continuations: only Book and Tag supported')
+                raise NotImplementedError('Lesmianator continuations: only Book and Tag supported')

 
             c, created = cls.objects.get_or_create(content_type=object_type, object_id=sth.id)
             c.pickle.save(sth.slug+'.p', ContentFile(cPickle.dumps((should_keys, conts))))
 
             c, created = cls.objects.get_or_create(content_type=object_type, object_id=sth.id)
             c.pickle.save(sth.slug+'.p', ContentFile(cPickle.dumps((should_keys, conts))))