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

merging changes

Browse source
This commit is contained in:
rolux 2011-08-19 06:40:49 +00:00
commit 5366941bc1
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pandora/archive/models.py
View file

@ -494,12 +494,12 @@ class Stream(models.Model):
for f in settings.VIDEO_FORMATS: for f in settings.VIDEO_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)
if created: if created:
derivative.source = self derivative.source = self
name = derivative.name() name = derivative.name()
derivative.video.name = os.path.join(os.path.dirname(self.video.name), name) derivative.video.name = os.path.join(os.path.dirname(self.video.name), name)
derivative.encode() derivative.encode()
derivative.save() derivative.save()
return True return True
def encode(self): def encode(self):
@ -529,7 +529,7 @@ class Stream(models.Model):
def json(self): def json(self):
if settings.XSENDFILE or settings.XACCELREDIRECT: if settings.XSENDFILE or settings.XACCELREDIRECT:
base_url = '/%s' % self.file.itemId base_url = '/%s' % self.file.item.itemId
else: else:
base_url = os.path.dirname(self.video.url) base_url = os.path.dirname(self.video.url)
return { return {