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

Limit user stat list size

Browse Source
This commit is contained in:
Daan Sprenkels
2018-12-14 17:29:50 +01:00
parent 6153a09277
commit 298c89fc4d
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
marietje/stats/utils.py
View File

@ -133,14 +133,16 @@ def user_stats(request):
| Q(user_id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values( | Q(user_id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values(
'song__artist', 'song__artist',
'song__title').annotate(total=Count('id')).order_by( 'song__title').annotate(total=Count('id')).order_by(
'-total', 'song__artist', 'song__title') '-total', 'song__artist',
'song__title')[: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(
Q(user_id=None) Q(user_id=None)
| Q(user_id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values( | Q(user_id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values(
'song__user__id', 'song__user__name').annotate( 'song__user__id', 'song__user__name').annotate(
total=Count('song__user__id')).order_by('-total') total=Count('song__user__id')).order_by(
'-total')[:settings.STATS_TOP_COUNT]
most_played_uploads = PlaylistSong.objects.filter( most_played_uploads = 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(
@ -149,7 +151,8 @@ def user_stats(request):
'pk').values( 'pk').values(
'song__artist', 'song__artist',
'song__title').annotate(total=Count('id')).order_by( 'song__title').annotate(total=Count('id')).order_by(
'-total', 'song__artist', 'song__title') '-total', 'song__artist',
'song__title')[:settings.STATS_TOP_COUNT]
total_played_uploads = most_played_uploads.aggregate(newtotal=Sum('total')) total_played_uploads = most_played_uploads.aggregate(newtotal=Sum('total'))