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

Fucking Pylint.

Browse Source
This commit is contained in:
Olaf Slomp
2020-03-28 13:23:36 +01:00
parent 716c159648
commit c65bdcabd8
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
marietje/stats/utils.py
View File

@ -234,20 +234,21 @@ def user_stats(request):
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(
filter=~Q(user__id=request)), user_total=Count('id', 'song__artist', filter=~Q(user__id=request)), user_total=Count(
filter=Q(user__id=request))).order_by('-total', 'song__artist') 'id', filter=Q(user__id=request))).order_by(
'-total','song__artist')
most_played = list(most_played_uploads) most_played = list(most_played_uploads)
total_played_uploads = 0 total_played = {}
total_played_user_uploads = 0 total_played['uploads'] = 0
total_played['user_uploads'] = 0
for x in most_played: for x in most_played:
total_played_uploads += x['total'] total_played['uploads'] += x['total']
total_played_user_uploads += x['user_total'] total_played['user_uploads'] += x['user_total']
most_played_uploads_list = sorted(most_played_uploads, key=lambda x: (x['song__artist'], x['song__title'])) most_played_uploads_list = sorted(most_played_uploads, key=lambda x: (x['song__artist'], x['song__title']))
most_played_uploads_list = sorted(most_played_uploads_list, key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT] most_played_uploads_list = sorted(most_played_uploads_list, key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
most_played_uploaded_artists = list(most_played_uploaded_artists) most_played_uploaded_artists = sorted(list(most_played_uploaded_artists), key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
most_played_uploaded_artists_list = sorted(most_played_uploaded_artists, key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
return { return {
'last_updated': last_updated, 'last_updated': last_updated,
'total_uploads': total_uploads, 'total_uploads': total_uploads,
@ -259,7 +260,7 @@ def user_stats(request):
'most_played_uploads': most_played_uploads_list, 'most_played_uploads': most_played_uploads_list,
'most_played_uploaded_artists': most_played_uploaded_artists_list, 'most_played_uploaded_artists': most_played_uploaded_artists_list,
'stats_top_count': settings.STATS_TOP_COUNT, 'stats_top_count': settings.STATS_TOP_COUNT,
'total_played_uploads': total_played_uploads, 'total_played_uploads': total_played['uploads'],
'total_played_user_uploads': total_played_user_uploads, 'total_played_user_uploads': total_played['user_uploads'],
'biggest_fans': list(biggest_fans), 'biggest_fans': list(biggest_fans),
} }