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

make sure derivative name is set before encoding

Browse source
This commit is contained in:
j 2012-12-14 15:05:37 +01:00
parent 18d9c93fff
commit 28aadd6a43
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pandora/archive/models.py
View file

@ -437,14 +437,18 @@ class Stream(models.Model):
for f in config['formats']: for f in config['formats']:
derivative, created = Stream.objects.get_or_create(file=self.file, derivative, created = Stream.objects.get_or_create(file=self.file,
resolution=resolution, format=f) resolution=resolution, format=f)
name = derivative.name()
name = os.path.join(os.path.dirname(self.video.name), name)
if created: if created:
derivative.source = self derivative.source = self
derivative.save() derivative.save()
name = derivative.name() derivative.video.name = name
derivative.video.name = os.path.join(os.path.dirname(self.video.name), name)
derivative.encode() derivative.encode()
derivative.save() derivative.save()
elif rebuild or not derivative.available: elif rebuild or not derivative.available:
if not derivative.video:
derivative.video.name = name
derivative.encode() derivative.encode()
return True return True