X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/42dee4014c452c1f9f6b29891bca9800e5ad3528..cd21f43fa5074d843235639ba14b699d4eadc131:/apps/lesmianator/models.py?ds=sidebyside diff --git a/apps/lesmianator/models.py b/apps/lesmianator/models.py index dce4b15b1..74aecfea4 100644 --- a/apps/lesmianator/models.py +++ b/apps/lesmianator/models.py @@ -147,11 +147,17 @@ class Continuations(models.Model): @classmethod def get(cls, sth): 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,))) try: obj = cls.objects.get(content_type=object_type, object_id=sth.id) f = open(obj.pickle.path) - conts = cPickle.load(f) + keys, conts = cPickle.load(f) f.close() + if set(keys) != should_keys: + obj.delete() + raise cls.DoesNotExist return conts except cls.DoesNotExist: if isinstance(sth, Book): @@ -162,7 +168,7 @@ class Continuations(models.Model): raise NotImplemented('Lesmianator continuations: only Book and Tag supported') c = cls(content_object=sth) - c.pickle.save(sth.slug+'.p', ContentFile(cPickle.dumps(conts))) + c.pickle.save(sth.slug+'.p', ContentFile(cPickle.dumps((should_keys, conts)))) c.save() return conts