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

Compare commits

merge into: technicie:marietje-zuid
Branches Tags
technicie:marietje-zuid technicie:feature/marietje-4.1-in-header technicie:feature/log-api-endpoints technicie:fix/poetry-install technicie:feature/player-endpoints technicie:feature/docker-build technicie:fix/sort-title-artist technicie:tosti-information technicie:oslomp/quickfix_artists technicie:oslomp/artists technicie:search
...
pull from: technicie:oslomp/artists
Branches Tags
technicie:marietje-zuid technicie:feature/marietje-4.1-in-header technicie:feature/log-api-endpoints technicie:fix/poetry-install technicie:feature/player-endpoints technicie:feature/docker-build technicie:fix/sort-title-artist technicie:tosti-information technicie:oslomp/quickfix_artists technicie:oslomp/artists technicie:search

12 Commits
marietje-z ... oslomp/art

Author SHA1 Message Date
Olaf Slomp
42a76004d2 quickfix artist stats 2020-03-28 15:08:10 +01:00
Olaf Slomp
51c04de639 artist stats fix 2020-03-28 15:04:42 +01:00
Olaf Slomp
e287bae4fd Merge branch 'marietje-zuid' of gitlab.science.ru.nl:dsprenkels/MarietjeDjango into oslomp/artists 2020-03-28 14:21:55 +01:00
Olaf Slomp
dd21a3c97d Fucking Pylint 2.0. 2020-03-28 13:26:43 +01:00
Olaf Slomp
c65bdcabd8 Fucking Pylint. 2020-03-28 13:23:36 +01:00
Olaf Slomp
716c159648 even more indentation fixes. 2020-03-28 13:15:42 +01:00
Olaf Slomp
cec537d70e more indentation fixes. 2020-03-28 13:11:18 +01:00
Olaf Slomp
078e45dbbe more textual fixes 2020-03-28 13:06:54 +01:00
Olaf Slomp
f66e13883c textual fix 2020-03-28 13:02:48 +01:00
Olaf Slomp
fbbc944e71 fixed indentation 2020-03-28 13:00:31 +01:00
Olaf Slomp
a6cc389e0b mini fixes 2020-03-28 12:56:27 +01:00
Olaf Slomp
8b437310ab Added artist-specific stats 2020-03-28 12:53:26 +01:00
1 changed files with 3 additions and 2 deletions
Expand all files Collapse all files

5
marietje/stats/utils.py
View File

@ -109,8 +109,8 @@ def compute_stats():
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]
'song__artist').annotate(total=Count('song__artist')).order_by(
'-total', 'song__artist')[:settings.STATS_TOP_COUNT]
stats['most_played_songs_14_days'] = PlaylistSong.objects.filter(
state=2, played_at__gte=timezone.now() -
@ -171,6 +171,7 @@ def compute_stats():
'unique_request_stats': list(stats['unique_request_stats']),
'total_unique_requests': "{0:,.0f}".format(stats['total_unique_requests']['total']),
'most_played_songs': list(stats['most_played_songs']),
'most_played_artists': list(stats['most_played_artists']),
'most_played_songs_14_days': list(stats['most_played_songs_14_days']),
'time_requested': stats['time_requested'],
'total_time_requested': str(round(float(