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

Oslomp/stats bugfixes

Browse Source
This commit is contained in:
Olaf Slomp
2019-02-28 10:45:01 +01:00
committed by Gerdriaan Mulder
parent 409c5b2930
commit 3f263ae429
4 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
marietje/stats/utils.py
View File

@ -127,7 +127,7 @@ def compute_stats():
total_time_overall = sum(x['avg_dur'] for x in list(stats['time_requested']))
total_average = total_time_overall / len(stats['time_requested'])
avg_dur_min, avg_dur_sec = divmod(total_average, 60)
total_average = '{} minutes and {} seconds'.format(
total_average = '{:.0f} minutes and {:.0f} seconds'.format(
avg_dur_min, avg_dur_sec)
requests_uploader = PlaylistSong.objects.filter(state=2).exclude(
@ -138,7 +138,7 @@ def compute_stats():
most_requested_uploaders = []
best_uploaders_list(list(requests_uploader), most_requested_uploaders)
most_requested_uploaders = sorted(most_requested_uploaders, key=lambda x: x['total'], reverse=True)[:settings.STATS_TOP_COUNT]
for time in list(stats['time_requested']):
# converts total time and average time in respectively days and minutes, seconds
time['duration'] = str(round(time['total'] / 86400, 2)) + ' days'
@ -150,13 +150,13 @@ def compute_stats():
# Convert requested time to days
time_requested = list(stats['time_requested'])
for tr in time_requested:
tr['duration'] = str(round(tr['total'] / 86400, 2)) + ' days'
tr['duration'] = "{:5.2f} days".format(tr['total'] / 86400)
return {
'last_updated': last_updated,
'total_uploads': stats['total_uploads'],
'total_uploads': "{0:,.0f}".format(stats['total_uploads']),
'upload_stats': list(stats['upload_stats']),
'total_requests': stats['total_requests'],
'total_requests': "{0:,.0f}".format(stats['total_requests']),
'request_stats': list(stats['request_stats']),
'unique_request_stats': list(stats['unique_request_stats']),
'total_unique_requests': stats['total_unique_requests'],
@ -207,7 +207,7 @@ def user_stats(request):
total=Count('id', filter=~Q(user__id=request)),
user_total=Count('id', filter=Q(user__id=request))).order_by(
'-total', 'song__artist',
'song__title')[:settings.STATS_TOP_COUNT]
'song__title')
most_played = list(most_played_uploads)
total_played_uploads = 0
@ -215,7 +215,8 @@ def user_stats(request):
for x in most_played:
total_played_uploads += x['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_list, key=lambda x: x["total"], reverse=True)[:settings.STATS_TOP_COUNT]
return {
'last_updated': last_updated,
'total_uploads': total_uploads,
@ -223,7 +224,7 @@ def user_stats(request):
'unique_requests': unique_requests,
'most_played_songs': list(most_played_songs),
'most_played_uploaders': list(most_played_uploaders),
'most_played_uploads': list(most_played_uploads),
'most_played_uploads': most_played_uploads_list,
'stats_top_count': settings.STATS_TOP_COUNT,
'total_played_uploads': total_played_uploads,
'total_played_user_uploads': total_played_user_uploads,