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

clip_qs

Browse source
This commit is contained in:
j 2014-11-21 14:15:42 +00:00
parent bf1bf50af8
commit a9091db9ef
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/edit/models.py
View file

@ -319,12 +319,13 @@ class Edit(models.Model):
} }
if 'clips' in keys: if 'clips' in keys:
clips = self.get_clips_json(user) clips = self.get_clips_json(user)
clips_qs = self.get_clips(user)
for key in keys: for key in keys:
if key == 'id': if key == 'id':
response[key] = self.get_id() response[key] = self.get_id()
elif key == 'items': elif key == 'items':
response[key] = self.get_clips(user).count() response[key] = clips_qs.count()
elif key == 'query': elif key == 'query':
if not self.query.get('static', False): if not self.query.get('static', False):
response[key] = self.query response[key] = self.query
@ -333,9 +334,9 @@ class Edit(models.Model):
elif key == 'duration': elif key == 'duration':
if self.type == 'static': if self.type == 'static':
response[key] = sum([(c['annotation__end'] or c['end']) - (c['annotation__start'] or c['start']) response[key] = sum([(c['annotation__end'] or c['end']) - (c['annotation__start'] or c['start'])
for c in self.get_clips(user).values('start', 'end', 'annotation__start', 'annotation__end')]) for c in clips_qs.values('start', 'end', 'annotation__start', 'annotation__end')])
else: else:
response[key] = sum([c['end'] - c['start'] for c in self.get_clips(user).values('start', 'end')]) response[key] = sum([c['end'] - c['start'] for c in clips_qs.values('start', 'end')])
elif key == 'editable': elif key == 'editable':
response[key] = self.editable(user) response[key] = self.editable(user)
elif key == 'user': elif key == 'user':