yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 09:19:16 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Eliot Berriot 2019-03-21 10:46:28 +01:00
commit e587e5aebc
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
24 changed files with 117 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/funkwhale_api/federation/models.py
View file

@ -53,11 +53,15 @@ class ActorQuerySet(models.QuerySet):
def with_current_usage(self):
qs = self
for s in ["pending", "skipped", "errored", "finished"]:
uploads_query = models.Q(
libraries__uploads__import_status=s,
libraries__uploads__audio_file__isnull=False,
libraries__uploads__audio_file__ne="",
)
qs = qs.annotate(
**{
"_usage_{}".format(s): models.Sum(
"libraries__uploads__size",
filter=models.Q(libraries__uploads__import_status=s),
"libraries__uploads__size", filter=uploads_query
)
}
)