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

Added artist-specific stats

Browse Source
This commit is contained in:
Olaf Slomp
2020-03-28 12:53:26 +01:00
parent af6031c3a5
commit 8b437310ab
3 changed files with 101 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
marietje/stats/utils.py
View File

@ -80,6 +80,7 @@ def compute_stats():
Q(user_id=None)
| Q(user_id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).count()
stats['request_stats'] = PlaylistSong.objects.filter(state=2).exclude(
Q(user_id=None)
| Q(user_id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values(
@ -106,6 +107,12 @@ def compute_stats():
'song__title').annotate(total=Count('id')).order_by(
'-total', 'song__artist')[:settings.STATS_TOP_COUNT]
stats['most_played_artists'] = PlaylistSong.objects.filter(state=2).exclude(
Q(user_id=None)
| Q(user_id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values(
'song__artist__id', 'song__artist__name').annotate(total=Count('song__artist__id')).order_by(
'-total', 'song__artist__name')[:settings.STATS_TOP_COUNT]
stats['most_played_songs_14_days'] = PlaylistSong.objects.filter(
state=2, played_at__gte=timezone.now() -
timedelta(days=14)).exclude(user_id=None).values(
@ -164,6 +171,7 @@ def compute_stats():
'request_stats': list(stats['request_stats']),
'unique_request_stats': list(stats['unique_request_stats']),
'total_unique_requests': "{0:,.0f}".format(stats['total_unique_requests']['total']),
'total_unique_artists': "{0:,.0f}".format(stats['total_unique_artists']['total']),
'most_played_songs': list(stats['most_played_songs']),
'most_played_songs_14_days': list(stats['most_played_songs_14_days']),
'time_requested': stats['time_requested'],
@ -197,6 +205,12 @@ def user_stats(request):
'-total', 'song__artist',
'song__title')[:settings.STATS_TOP_COUNT]
most_played_artists = PlaylistSong.objects.filter(
user__id=request, state=2,
song_id__isnull=False).values('song__artist').annotate(
total=Count('song__artist')).order_by('-total',
'song__artist')[:settings.STATS_TOP_COUNT]
most_played_uploaders = PlaylistSong.objects.filter(
user__id=request, state=2).exclude(
Q(user_id=None)
@ -221,6 +235,13 @@ def user_stats(request):
'-total', 'song__artist',
'song__title')
most_played_uploaded_artists = PlaylistSong.objects.filter(
state=2, song_id__in=Song.objects.filter(user__id=request)).exclude(
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))).order_by(
'-total', 'song__artist')
most_played = list(most_played_uploads)
total_played_uploads = 0
total_played_user_uploads = 0
@ -229,14 +250,18 @@ def user_stats(request):
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_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_list = sorted(most_played_uploaded_artists, key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
return {
'last_updated': last_updated,
'total_uploads': total_uploads,
'total_requests': total_requests,
'unique_requests': unique_requests,
'most_played_songs': list(most_played_songs),
'most_played_artists': list(most_played_artists),
'most_played_uploaders': list(most_played_uploaders),
'most_played_uploads': most_played_uploads_list,
'most_played_uploaded_artists': most_played_uploaded_artists_list,
'stats_top_count': settings.STATS_TOP_COUNT,
'total_played_uploads': total_played_uploads,
'total_played_user_uploads': total_played_user_uploads,