available
This commit is contained in:
parent
20fe099c32
commit
ef58797099
2 changed files with 6 additions and 1 deletions
|
@ -161,6 +161,7 @@ class File(models.Model):
|
|||
def save(self, *args, **kwargs):
|
||||
if self.auto:
|
||||
self.set_state()
|
||||
self.available = self.streams.filter(source=None, available=True).count() > 0
|
||||
super(File, self).save(*args, **kwargs)
|
||||
|
||||
#upload and data handling
|
||||
|
@ -498,6 +499,7 @@ class Stream(models.Model):
|
|||
resolution=resolution, format=f)
|
||||
if created:
|
||||
derivative.source = self
|
||||
derivative.save()
|
||||
name = derivative.name()
|
||||
derivative.video.name = os.path.join(os.path.dirname(self.video.name), name)
|
||||
derivative.encode()
|
||||
|
@ -528,6 +530,8 @@ class Stream(models.Model):
|
|||
else:
|
||||
self.aspect_ratio = 128/80
|
||||
super(Stream, self).save(*args, **kwargs)
|
||||
if self.available and not self.file.available:
|
||||
self.file.save()
|
||||
|
||||
def json(self):
|
||||
if settings.XSENDFILE or settings.XACCELREDIRECT:
|
||||
|
|
|
@ -793,7 +793,8 @@ class Item(models.Model):
|
|||
self.save()
|
||||
|
||||
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):
|
||||
config = site_config()
|
||||
|
|
Loading…
Reference in a new issue