From: Radek Czajka Date: Mon, 21 Feb 2011 12:42:40 +0000 (+0100) Subject: lesmianator continuations cache fixes X-Git-Url: https://git.mdrn.pl/wolnelektury.git/commitdiff_plain/fab2510d92afec657693cdf6887ad9cee8376499 lesmianator continuations cache fixes --- diff --git a/apps/lesmianator/migrations/0003_auto__add_unique_continuations_object_id_content_type.py b/apps/lesmianator/migrations/0003_auto__add_unique_continuations_object_id_content_type.py new file mode 100644 index 000000000..102d2f930 --- /dev/null +++ b/apps/lesmianator/migrations/0003_auto__add_unique_continuations_object_id_content_type.py @@ -0,0 +1,78 @@ +# encoding: utf-8 +import datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + +class Migration(SchemaMigration): + + def forwards(self, orm): + + # Adding unique constraint on 'Continuations', fields ['object_id', 'content_type'] + db.create_unique('lesmianator_continuations', ['object_id', 'content_type_id']) + + + def backwards(self, orm): + + # Removing unique constraint on 'Continuations', fields ['object_id', 'content_type'] + db.delete_unique('lesmianator_continuations', ['object_id', 'content_type_id']) + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'auth.user': { + 'Meta': {'object_name': 'User'}, + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Group']", 'symmetrical': 'False', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['auth.Permission']", 'symmetrical': 'False', 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'lesmianator.continuations': { + 'Meta': {'unique_together': "(('content_type', 'object_id'),)", 'object_name': 'Continuations'}, + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'object_id': ('django.db.models.fields.PositiveIntegerField', [], {}), + 'pickle': ('django.db.models.fields.files.FileField', [], {'max_length': '100'}) + }, + 'lesmianator.poem': { + 'Meta': {'object_name': 'Poem'}, + 'created_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'created_by': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['auth.User']", 'null': 'True'}), + 'created_from': ('catalogue.fields.JSONField', [], {'null': 'True', 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'seen_at': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}), + 'slug': ('django.db.models.fields.SlugField', [], {'max_length': '120', 'db_index': 'True'}), + 'text': ('django.db.models.fields.TextField', [], {}), + 'view_count': ('django.db.models.fields.IntegerField', [], {'default': '1'}) + } + } + + complete_apps = ['lesmianator'] diff --git a/apps/lesmianator/models.py b/apps/lesmianator/models.py index 4b3daf8d2..0a59ddee4 100644 --- a/apps/lesmianator/models.py +++ b/apps/lesmianator/models.py @@ -100,6 +100,9 @@ class Continuations(models.Model): object_id = models.PositiveIntegerField() content_object = generic.GenericForeignKey('content_type', 'object_id') + class Meta: + unique_together = (('content_type', 'object_id'), ) + def __unicode__(self): return "Continuations for: %s" % unicode(self.content_object) @@ -115,7 +118,6 @@ class Continuations(models.Model): @classmethod def for_book(cls, book, length=3): # count from this book only - print 'for_book', book output = StringIO() f = open(book.xml_file.path) text.transform(f, output, False, ('raw-text',)) @@ -152,11 +154,12 @@ class Continuations(models.Model): should_keys = set(b.pk for b in Book.tagged.with_any((sth,))) try: obj = cls.objects.get(content_type=object_type, object_id=sth.id) + if not obj.pickle: + raise cls.DoesNotExist f = open(obj.pickle.path) keys, conts = cPickle.load(f) f.close() if set(keys) != should_keys: - obj.delete() raise cls.DoesNotExist return conts except cls.DoesNotExist: @@ -167,7 +170,7 @@ class Continuations(models.Model): else: raise NotImplemented('Lesmianator continuations: only Book and Tag supported') - c = cls(content_object=sth) + 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.save() return conts