technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-10 05:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

even more indentation fixes.

Browse Source
This commit is contained in:
Olaf Slomp
2020-03-28 13:15:42 +01:00
parent cec537d70e
commit 716c159648
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
marietje/stats/utils.py
View File

@ -205,9 +205,9 @@ def user_stats(request):
most_played_artists = PlaylistSong.objects.filter( most_played_artists = PlaylistSong.objects.filter(
user__id=request, state=2, user__id=request, state=2,
song_id__isnull=False).values('song__artist').annotate( song_id__isnull=False).values('song__artist').annotate(
total=Count('song__artist')).order_by('-total', total=Count('song__artist')).order_by(
'song__artist')[:settings.STATS_TOP_COUNT] '-total', 'song__artist')[:settings.STATS_TOP_COUNT]
most_played_uploaders = PlaylistSong.objects.filter( most_played_uploaders = PlaylistSong.objects.filter(
user__id=request, state=2).exclude( user__id=request, state=2).exclude(
@ -230,15 +230,13 @@ def user_stats(request):
user__id=None).values('song__artist', 'song__title').annotate( user__id=None).values('song__artist', 'song__title').annotate(
total=Count('id', filter=~Q(user__id=request)), total=Count('id', filter=~Q(user__id=request)),
user_total=Count('id', filter=Q(user__id=request))).order_by( user_total=Count('id', filter=Q(user__id=request))).order_by(
'-total', 'song__artist', '-total', 'song__artist', 'song__title')
'song__title')
most_played_uploaded_artists = PlaylistSong.objects.filter( most_played_uploaded_artists = PlaylistSong.objects.filter(
state=2, song_id__in=Song.objects.filter(user__id=request)).exclude( state=2, song_id__in=Song.objects.filter(user__id=request)).exclude(
user__id=None).values('song__artist').annotate(total=Count('song__artist', user__id=None).values('song__artist').annotate(total=Count('song__artist',
filter=~Q(user__id=request)), user_total=Count('id', filter=~Q(user__id=request)), user_total=Count('id',
filter=Q(user__id=request))).order_by( filter=Q(user__id=request))).order_by('-total', 'song__artist')
'-total', 'song__artist')
most_played = list(most_played_uploads) most_played = list(most_played_uploads)
total_played_uploads = 0 total_played_uploads = 0