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

better defaults, return broken frame instead of error, do not redirect to 0xdb.org poster

Browse source
This commit is contained in:
j 2011-02-23 16:06:20 +01:00
commit 88df4a3ee6
4 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/models.py
View file

@ -330,6 +330,8 @@ class Item(models.Model):
stream['duration'] = s.info['duration']
if 'video' in s.info and s.info['video']:
stream['aspectRatio'] = s.info['video'][0]['width'] / s.info['video'][0]['height']
else:
stream['aspectRatio'] = 4/3
if settings.XSENDFILE or settings.XACCELREDIRECT:
stream['baseUrl'] = '/%s' % self.itemId
else:
@ -607,6 +609,8 @@ class Item(models.Model):
'frames', "%d"%width, "%s.jpg"%position)
if not os.path.exists(path):
extract.frame(stream.video.path, path, position, width)
if not os.path.exists(path):
path = os.path.join(settings.STATIC_ROOT, 'png/frame.broken.png')
return path
@property