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

sequence duration

Browse source
This commit is contained in:
j 2012-06-16 23:44:05 +02:00
parent 72be96fe56
commit c405d007eb
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/sequence/models.py
View file

@ -30,6 +30,7 @@ class Sequence(models.Model):
hash = models.CharField(db_index=True, max_length=16, default='') hash = models.CharField(db_index=True, max_length=16, default='')
start = models.FloatField(default=-1, db_index=True) start = models.FloatField(default=-1, db_index=True)
end = models.FloatField(default=-1) end = models.FloatField(default=-1)
duration = models.FloatField(default=0)
objects = managers.SequenceManager() objects = managers.SequenceManager()
@ -37,6 +38,7 @@ class Sequence(models.Model):
self.public_id = u"%s/%0.03f-%0.03f" % ( self.public_id = u"%s/%0.03f-%0.03f" % (
self.item.itemId, float(self.start), float(self.end) self.item.itemId, float(self.start), float(self.end)
) )
self.duration = self.end - self.start
if self.item: if self.item:
self.user = self.item.user and self.item.user.id self.user = self.item.user and self.item.user.id
self.sort = self.item.sort self.sort = self.item.sort

2
pandora/sequence/views.py
View file

@ -41,7 +41,7 @@ def order_query(qs, sort):
'out': 'end', 'out': 'end',
'position': 'start', 'position': 'start',
}.get(e['key'], e['key']) }.get(e['key'], e['key'])
if key not in ('start', 'end', 'mode', 'hash'): if key not in ('duration', 'start', 'end', 'mode', 'hash'):
key = 'sort__%s' % key key = 'sort__%s' % key
order = '%s%s' % (operator, key) order = '%s%s' % (operator, key)
order_by.append(order) order_by.append(order)