0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

findvalue can be Null, clip random sort

Browse source
This commit is contained in:
j 2012-03-08 19:56:31 +01:00
commit 26c6987178
4 changed files with 18 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/clip/models.py
View file

@ -115,12 +115,14 @@ attrs = {
'aspect_ratio': models.FloatField(default=0),
'item': models.ForeignKey('item.Item', related_name='clips'),
'random': models.BigIntegerField(default=0, db_index=True),
#seconds
'start': models.FloatField(default=-1, db_index=True),
'end': models.FloatField(default=-1),
'duration': models.FloatField(default=0, db_index=True),
#get from annotation
'hue': models.FloatField(default=0, db_index=True),
'saturation': models.FloatField(default=0, db_index=True),
@ -130,7 +132,7 @@ attrs = {
'director': models.CharField(max_length=1000, null=True, db_index=True),
'title': models.CharField(max_length=1000, db_index=True),
'sortvalue': models.CharField(max_length=1000, null=True, db_index=True),
'findvalue': models.TextField(),
'findvalue': models.TextField(null=True),
}
for name in settings.CONFIG['clipLayers']:
attrs[name] = models.BooleanField(default=False, db_index=True)

3
pandora/clip/views.py
View file

@ -41,7 +41,8 @@ def order_query(qs, sort):
operator = ''
clip_keys = ('public_id', 'start', 'end', 'hue', 'saturation', 'lightness', 'volume',
'duration', 'sortvalue', 'videoRatio',
'director', 'title')
'director', 'title',
'random')
key = {
'id': 'public_id',
'in': 'start',