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

findClips: only scan layers once

Browse source
This commit is contained in:
Will Thompson 2016-04-18 15:06:55 +01:00
parent 27830d7c58
commit 6dbb7f921a
No known key found for this signature in database
GPG key ID: 3422DC0D7AD482A7
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pandora/clip/views.py
View file

@ -97,7 +97,9 @@ def findClips(request, data):
qs = qs[query['range'][0]:query['range'][1]] qs = qs[query['range'][0]:query['range'][1]]
ids = [] ids = []
layer_ids = [k['id'] for k in settings.CONFIG['layers']] layers = settings.CONFIG['layers']
subtitles = utils.get_by_key(layers, 'isSubtitles', True)
layer_ids = [k['id'] for k in layers]
keys = filter(lambda k: k not in layer_ids + ['annotations'], data['keys']) keys = filter(lambda k: k not in layer_ids + ['annotations'], data['keys'])
if filter(lambda k: k not in models.Clip.clip_keys, keys): if filter(lambda k: k not in models.Clip.clip_keys, keys):
qs = qs.select_related('sort') qs = qs.select_related('sort')
@ -114,7 +116,6 @@ def findClips(request, data):
def add_annotations(key, qs, add_layer=False): def add_annotations(key, qs, add_layer=False):
values = ['public_id', 'value', 'clip__start', 'clip__end'] values = ['public_id', 'value', 'clip__start', 'clip__end']
subtitles = utils.get_by_key(settings.CONFIG['layers'], 'isSubtitles', True)
if subtitles or add_layer: if subtitles or add_layer:
values.append('layer') values.append('layer')
if query['filter']: if query['filter']:
@ -140,7 +141,7 @@ def findClips(request, data):
aqs = Annotation.objects.filter(layer__in=settings.CONFIG['clipLayers'], aqs = Annotation.objects.filter(layer__in=settings.CONFIG['clipLayers'],
clip__in=ids) clip__in=ids)
add_annotations('annotations', aqs , True) add_annotations('annotations', aqs , True)
layer_ids = [k['id'] for k in settings.CONFIG['layers']]
for layer in filter(lambda l: l in keys, layer_ids): for layer in filter(lambda l: l in keys, layer_ids):
aqs = Annotation.objects.filter(layer=layer, clip__in=ids) aqs = Annotation.objects.filter(layer=layer, clip__in=ids)
add_annotations(layer, aqs) add_annotations(layer, aqs)