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

avoid async, fails in python3.7

Browse source
This commit is contained in:
j 2019-07-14 19:23:06 +01:00
parent 5cd106c08a
commit 7864ca1f70
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pandora/item/models.py
View file

@ -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)

4
pandora/item/tasks.py
View file

@ -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):