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

available

Browse source
This commit is contained in:
j 2011-08-21 10:57:53 +02:00
parent 20fe099c32
commit ef58797099
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/archive/models.py
View file

@ -161,6 +161,7 @@ class File(models.Model):
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
if self.auto: if self.auto:
self.set_state() self.set_state()
self.available = self.streams.filter(source=None, available=True).count() > 0
super(File, self).save(*args, **kwargs) super(File, self).save(*args, **kwargs)
#upload and data handling #upload and data handling
@ -498,6 +499,7 @@ class Stream(models.Model):
resolution=resolution, format=f) resolution=resolution, format=f)
if created: if created:
derivative.source = self derivative.source = self
derivative.save()
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()
@ -528,6 +530,8 @@ class Stream(models.Model):
else: else:
self.aspect_ratio = 128/80 self.aspect_ratio = 128/80
super(Stream, self).save(*args, **kwargs) super(Stream, self).save(*args, **kwargs)
if self.available and not self.file.available:
self.file.save()
def json(self): def json(self):
if settings.XSENDFILE or settings.XACCELREDIRECT: if settings.XSENDFILE or settings.XACCELREDIRECT:

3
pandora/item/models.py
View file

@ -793,7 +793,8 @@ class Item(models.Model):
self.save() self.save()
def streams(self): def streams(self):
return [video.streams.filter(source=None)[0] for video in self.main_videos()] return [video.streams.filter(source=None, available=True)[0]
for video in self.main_videos()]
def update_timeline(self, force=False): def update_timeline(self, force=False):
config = site_config() config = site_config()