decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

Make Annotation.public_id non-NULLable (fixes #2829)

Browse source 
This fixes this race:

     request 1                          request 2
     -----------------------------      -------------------------
     addAnnotation(...)
     super(Annotation.self).save()
                                        findAnnotations(...)
                                        returns [{id: null, ...}]
     annotation.public_id = x
     returns {id: x}
This commit is contained in:
Will Thompson 2015-09-14 14:18:10 +02:00 • committed by j
commit 4f064fda76
4 changed files with 401 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pandora/annotation/models.py
View file

@ -89,7 +89,7 @@ class Annotation(models.Model):
item = models.ForeignKey('item.Item', related_name='annotations')
clip = models.ForeignKey('clip.Clip', null=True, related_name='annotations')
public_id = models.CharField(max_length=128, unique=True, null=True)
public_id = models.CharField(max_length=128, unique=True)
#seconds
start = models.FloatField(default=-1, db_index=True)
end = models.FloatField(default=-1, db_index=True)
@ -114,9 +114,7 @@ class Annotation(models.Model):
return cls.objects.get(public_id=id)
def set_public_id(self):
if self.id:
self.public_id = self.item.next_annotationid()
Annotation.objects.filter(id=self.id).update(public_id=self.public_id)
self.public_id = self.item.next_annotationid()
@classmethod
def public_layers(self):
@ -166,10 +164,11 @@ class Annotation(models.Model):
if not self.clip or self.start != self.clip.start or self.end != self.clip.end:
self.clip, created = Clip.get_or_create(self.item, self.start, self.end)
super(Annotation, self).save(*args, **kwargs)
if set_public_id:
self.set_public_id()
super(Annotation, self).save(*args, **kwargs)
if self.clip:
Clip.objects.filter(**{
'id': self.clip.id,