Compare commits
2 commits
50f4e8b07f
...
7864ca1f70
| Author | SHA1 | Date | |
|---|---|---|---|
| 7864ca1f70 | |||
| 5cd106c08a |
3 changed files with 6 additions and 6 deletions
|
|
@ -1361,7 +1361,7 @@ class Item(models.Model):
|
||||||
qs = qs.order_by('file__part', 'file__sort_path')
|
qs = qs.order_by('file__part', 'file__sort_path')
|
||||||
return qs
|
return qs
|
||||||
|
|
||||||
def update_timeline(self, async=True):
|
def update_timeline(self, async_=True):
|
||||||
streams = self.streams()
|
streams = self.streams()
|
||||||
self.make_timeline()
|
self.make_timeline()
|
||||||
if streams.count() == 1:
|
if streams.count() == 1:
|
||||||
|
|
@ -1391,7 +1391,7 @@ class Item(models.Model):
|
||||||
self.rendered = streams.count() > 0
|
self.rendered = streams.count() > 0
|
||||||
self.save()
|
self.save()
|
||||||
if self.rendered:
|
if self.rendered:
|
||||||
if async:
|
if async_:
|
||||||
get_sequences.delay(self.public_id)
|
get_sequences.delay(self.public_id)
|
||||||
else:
|
else:
|
||||||
get_sequences(self.public_id)
|
get_sequences(self.public_id)
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ def update_timeline(public_id):
|
||||||
item = models.Item.objects.get(public_id=public_id)
|
item = models.Item.objects.get(public_id=public_id)
|
||||||
except models.Item.DoesNotExist:
|
except models.Item.DoesNotExist:
|
||||||
return
|
return
|
||||||
item.update_timeline(async=False)
|
item.update_timeline(async_=False)
|
||||||
Task.finish(item)
|
Task.finish(item)
|
||||||
|
|
||||||
@task(queue="encoding")
|
@task(queue="encoding")
|
||||||
|
|
@ -111,7 +111,7 @@ def rebuild_timeline(public_id):
|
||||||
i = models.Item.objects.get(public_id=public_id)
|
i = models.Item.objects.get(public_id=public_id)
|
||||||
for s in i.streams():
|
for s in i.streams():
|
||||||
s.make_timeline()
|
s.make_timeline()
|
||||||
i.update_timeline(async=False)
|
i.update_timeline(async_=False)
|
||||||
|
|
||||||
@task(queue="encoding")
|
@task(queue="encoding")
|
||||||
def load_subtitles(public_id):
|
def load_subtitles(public_id):
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
Django==1.11.13
|
Django==1.11.22
|
||||||
simplejson
|
simplejson
|
||||||
chardet
|
chardet
|
||||||
celery==3.1.26.post2
|
celery==3.1.26.post2
|
||||||
|
|
@ -6,7 +6,7 @@ django-celery==3.2.2
|
||||||
django-extensions==2.0.7
|
django-extensions==2.0.7
|
||||||
gunicorn==19.8.1
|
gunicorn==19.8.1
|
||||||
html5lib
|
html5lib
|
||||||
requests==2.19.1
|
requests==2.22.0
|
||||||
tornado<5
|
tornado<5
|
||||||
geoip2==2.9.0
|
geoip2==2.9.0
|
||||||
youtube-dl>=2019.4.30
|
youtube-dl>=2019.4.30
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue