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

get all annotations at once and merge into clips

Browse source
This commit is contained in:
j 2011-10-29 13:04:25 +02:00
parent 8bb18af181
commit 79f8a1d154
2 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pandora/clip/models.py
View file

@ -79,16 +79,6 @@ class Clip(models.Model):
for key in j.keys(): for key in j.keys():
if key not in keys: if key not in keys:
del j[key] del j[key]
public_layers = [l['id']
for l in filter(lambda l: not l.get('private', False),
settings.CONFIG['layers'])]
if 'annotations' in keys:
j['annotations'] = [a.json(keys=['value', 'id', 'layer'])
for a in self.annotations.filter(layer__name__in=public_layers).select_related()]
for layer in filter(lambda l: l in keys, public_layers):
j[layer] = [a.json(keys=['id', 'value'])
for a in self.annotations.filter(layer__name=layer)]
for key in keys: for key in keys:
if key not in clip_keys and key not in j: if key not in clip_keys and key not in j:
value = self.item.get(key) value = self.item.get(key)

26
pandora/clip/views.py
View file

@ -80,8 +80,32 @@ def findClips(request):
qs = order_query(qs, query['sort']) qs = order_query(qs, query['sort'])
qs = qs[query['range'][0]:query['range'][1]] qs = qs[query['range'][0]:query['range'][1]]
qs = qs.select_related('item__sort') qs = qs.select_related('item__sort')
#qs = qs.prefetch_related('annotations')
response['data']['items'] = [p.json(keys=data['keys']) for p in qs] response['data']['items'] = [p.json(keys=data['keys']) for p in qs]
from django.conf import settings
from annotation.models import Annotation
keys = data['keys']
public_layers = [l['id']
for l in filter(lambda l: not l.get('private', False),
settings.CONFIG['layers'])]
def merge_annotations(layer, qs):
for a in qs.values('public_id', 'value', 'clip__public_id'):
for i in response['data']['items']:
if i['id'] == a['clip__public_id']:
if not i[layer]:
i[layer] = []
i[layer].append({
'id': a['public_id'],
'value': a['value'],
})
if 'annotations' in keys:
merge_annotations('annotations',
Annotation.objects.filter(layer__name__in=public_layers, clip__in=qs))
for layer in filter(lambda l: l in keys, public_layers):
merge_annotations(layer,
Annotation.objects.filter(layer__name=layer, clip__in=qs))
elif 'position' in query: elif 'position' in query:
qs = order_query(qs, query['sort']) qs = order_query(qs, query['sort'])
ids = [i.public_id for i in qs] ids = [i.public_id for i in qs]