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

merge

Browse source
This commit is contained in:
rolux 2011-11-07 12:13:08 +00:00
commit e669790e0f
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/archive/extract.py
View file

@ -294,7 +294,7 @@ def average_color(prefix, start=0, end=0):
timelines = sorted(filter(lambda t: t!= '%s%sp.png'%(prefix,height), glob("%s%sp*.png"%(prefix, height))))
for image in timelines:
start_offset = 0
if start and frames + 1500 < start:
if start and frames + 1500 <= start:
frames += 1500
continue
timeline = Image.open(image)
@ -311,12 +311,12 @@ def average_color(prefix, start=0, end=0):
p = np.asarray(timeline.convert('RGB'), dtype=np.float32)
p = np.sum(p, axis=0) / height #average color per frame
pixels.append(p)
if end and frames >= end:
break
if end:
frames = end - start
if frames:
for i in range(0, len(pixels)):
p = np.sum(pixels[i], axis=0) / frames
color += p

3
pandora/clip/managers.py
View file

@ -59,6 +59,9 @@ def parseCondition(condition, user):
return ~q
else:
return q
if (not exclude and op == '=' or op in ('$', '^', '>=', '<')) and v == '':
return Q(True)
if k.endswith('__id'):
v = decode_id(v)
if isinstance(v, bool): #featured and public flag

4
pandora/itemlist/models.py
View file

@ -34,8 +34,8 @@ class List(models.Model):
icon = models.ImageField(default=None, blank=True,
upload_to=lambda i, x: i.path("icon.jpg"))
view = models.TextField(default=lambda: settings.CONFIG['user']['ui']['listView'])
sort = TupleField(default=lambda: settings.CONFIG['user']['ui']['listSort'], editable=False)
view = models.TextField(default=lambda: tuple(settings.CONFIG['user']['ui']['listView']))
sort = TupleField(default=lambda: tuple(settings.CONFIG['user']['ui']['listSort']), editable=False)
poster_frames = TupleField(default=[], editable=False)