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

merging changes

Browse source
This commit is contained in:
rolux 2011-08-07 16:30:54 +00:00
commit d5d8701dc1
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pandora/item/models.py
View file

@ -701,7 +701,7 @@ class Item(models.Model):
height = min(height, stream.height()) height = min(height, stream.height())
path = os.path.join(settings.MEDIA_ROOT, self.path(), path = os.path.join(settings.MEDIA_ROOT, self.path(),
'frames', "%dp"%height, "%s.jpg"%position) 'frames', "%dp"%height, "%s.jpg"%position)
if not os.path.exists(path): if not os.path.exists(path) and stream.video:
extract.frame(stream.video.path, path, position, height) extract.frame(stream.video.path, path, position, height)
if not os.path.exists(path): if not os.path.exists(path):
path = os.path.join(settings.STATIC_ROOT, 'png/frame.broken.png') path = os.path.join(settings.STATIC_ROOT, 'png/frame.broken.png')