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

limit clips in smart lists to 100, fix items for smart lists

Browse source
This commit is contained in:
j 2014-02-05 13:50:23 +00:00
parent c81416bdd2
commit ccd214ecb4
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
pandora/edit/models.py
View file

@ -198,14 +198,24 @@ class Edit(models.Model):
def get_clips(self, user=None): def get_clips(self, user=None):
if self.type == 'static': if self.type == 'static':
clips = [c.json(user) for c in self.clips.all().order_by('index')] clips = self.clips.all()
else: else:
#FIXME: limit results!! clips = clip.models.Clip.objects.find(self.clip_query(), user)
clips = [c.edit_json(user) for c in clip.models.Clip.objects.find(self.clip_query(), user)] return clips
index = 0
for c in clips: def get_clips_json(self, user=None):
c['index'] = index qs = self.get_clips()
index += 1 if self.type == 'static':
clips = [c.json(user) for c in qs.order_by('index')]
else:
if qs.count() <= 100:
clips = [c.edit_json(user) for c in qs]
index = 0
for c in clips:
c['index'] = index
index += 1
else:
clips = []
return clips return clips
def clip_query(self): def clip_query(self):
@ -299,13 +309,13 @@ class Edit(models.Model):
'posterFrames': 'poster_frames' 'posterFrames': 'poster_frames'
} }
if 'clips' in keys or 'duration' in keys: if 'clips' in keys or 'duration' in keys:
clips = self.get_clips(user) clips = self.get_clips_json(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.clips.all().count() response[key] = self.get_clips().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