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

remove layer of indirection

Browse source
This commit is contained in:
j 2011-11-02 15:06:34 +01:00
commit df9fc699ff
7 changed files with 17 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pandora/clip/managers.py
View file

@ -41,7 +41,7 @@ def parseCondition(condition, user):
return parseCondition({'key': 'annotations__value',
'value': v,
'operator': op}, user) \
& parseCondition({'key': 'annotations__layer__name',
& parseCondition({'key': 'annotations__layer',
'value': k,
'operator': '=='}, user)

2
pandora/clip/models.py
View file

@ -31,7 +31,7 @@ class MetaClip:
if streams:
self.aspect_ratio = streams[0].aspect_ratio
for l in self.layers:
setattr(self, l, self.annotations.filter(layer__name=l).count()>0)
setattr(self, l, self.annotations.filter(layer=l).count()>0)
models.Model.save(self, *args, **kwargs)
def json(self, keys=None):

4
pandora/clip/views.py
View file

@ -105,10 +105,10 @@ def findClips(request):
if response['data']['items']:
if 'annotations' in keys:
add_annotations('annotations',
Annotation.objects.filter(layer__name__in=models.Clip.layers, clip__in=ids))
Annotation.objects.filter(layer__in=models.Clip.layers, clip__in=ids))
for layer in filter(lambda l: l in keys, models.Clip.layers):
add_annotations(layer,
Annotation.objects.filter(layer__name=layer, clip__in=ids))
Annotation.objects.filter(layer=layer, clip__in=ids))
elif 'position' in query:
qs = order_query(qs, query['sort'])
ids = [i.public_id for i in qs]