MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

More efficient SQL query to compute import batch status

This commit is contained in:
Eliot Berriot 2018-04-21 16:02:11 +02:00
parent e29cfb7301
commit d98c33e5ed
No known key found for this signature in database
GPG Key ID: DD6965E2476E5C27
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/funkwhale_api/music/models.py
View File

@ -507,6 +507,8 @@ class ImportBatch(models.Model):
def update_status(self): def update_status(self):
old_status = self.status old_status = self.status
self.status = utils.compute_status(self.jobs.all()) self.status = utils.compute_status(self.jobs.all())
if self.status == old_status:
return
self.save(update_fields=['status']) self.save(update_fields=['status'])
if self.status != old_status and self.status == 'finished': if self.status != old_status and self.status == 'finished':
from . import tasks from . import tasks

5
api/funkwhale_api/music/utils.py
View File

@ -53,10 +53,11 @@ def guess_mimetype(f):
def compute_status(jobs): def compute_status(jobs):
errored = any([job.status == 'errored' for job in jobs]) statuses = jobs.values_list('status', flat=True).distinct()
errored = any([status == 'errored' for status in statuses])
if errored: if errored:
return 'errored' return 'errored'
pending = any([job.status == 'pending' for job in jobs]) pending = any([status == 'pending' for status in statuses])
if pending: if pending:
return 'pending' return 'pending'
return 'finished' return 'finished'