random clip sort

This commit is contained in:
j 2012-03-22 20:40:37 +01:00
commit 8511769885
3 changed files with 14 additions and 10 deletions

View file

@ -115,7 +115,6 @@ attrs = {
'aspect_ratio': models.FloatField(default=0),
'item': models.ForeignKey('item.Item', related_name='clips'),
'random': models.BigIntegerField(default=0, db_index=True, null=True),
#seconds
'start': models.FloatField(default=-1, db_index=True),
@ -139,3 +138,7 @@ for name in settings.CONFIG['clipLayers']:
Clip = type('Clip', (MetaClip,models.Model), attrs)
class Random(models.Model):
clip = models.ForeignKey(Clip, primary_key=True)
random = models.BigIntegerField(db_index=True, null=True)

View file

@ -42,7 +42,7 @@ def order_query(qs, sort):
clip_keys = ('public_id', 'start', 'end', 'hue', 'saturation', 'lightness', 'volume',
'duration', 'sortvalue', 'videoRatio',
'director', 'title',
'random')
'random__random')
key = {
'id': 'public_id',
'in': 'start',
@ -50,6 +50,7 @@ def order_query(qs, sort):
'position': 'start',
'text': 'sortvalue',
'videoRatio': 'aspect_ratio',
'random': 'random__random',
}.get(e['key'], e['key'])
if key.startswith('clip:'):
key = e['key'][len('clip:'):]