Compare commits

..

No commits in common. "7864ca1f70371a3d6baff9a4eb7c23e52eb3a6c3" and "50f4e8b07f92d7135aecb1fc75488d19f8cdd09d" have entirely different histories.

3 changed files with 6 additions and 6 deletions

View file

@ -1361,7 +1361,7 @@ class Item(models.Model):
qs = qs.order_by('file__part', 'file__sort_path')
return qs
def update_timeline(self, async_=True):
def update_timeline(self, async=True):
streams = self.streams()
self.make_timeline()
if streams.count() == 1:
@ -1391,7 +1391,7 @@ class Item(models.Model):
self.rendered = streams.count() > 0
self.save()
if self.rendered:
if async_:
if async:
get_sequences.delay(self.public_id)
else:
get_sequences(self.public_id)

View file

@ -102,7 +102,7 @@ def update_timeline(public_id):
item = models.Item.objects.get(public_id=public_id)
except models.Item.DoesNotExist:
return
item.update_timeline(async_=False)
item.update_timeline(async=False)
Task.finish(item)
@task(queue="encoding")
@ -111,7 +111,7 @@ def rebuild_timeline(public_id):
i = models.Item.objects.get(public_id=public_id)
for s in i.streams():
s.make_timeline()
i.update_timeline(async_=False)
i.update_timeline(async=False)
@task(queue="encoding")
def load_subtitles(public_id):

View file

@ -1,4 +1,4 @@
Django==1.11.22
Django==1.11.13
simplejson
chardet
celery==3.1.26.post2
@ -6,7 +6,7 @@ django-celery==3.2.2
django-extensions==2.0.7
gunicorn==19.8.1
html5lib
requests==2.22.0
requests==2.19.1
tornado<5
geoip2==2.9.0
youtube-dl>=2019.4.30