mirror of
https://gitlab.science.ru.nl/technicie/MarietjeDjango.git
synced 2025-12-09 18:12:20 +01:00
Artist statistics
This commit is contained in:
Olaf Slomp
committed by
Gerdriaan Mulder
Gerdriaan Mulder
parent
6ec3d57a39
commit
c9ba37d291
@ -72,7 +72,7 @@
|
||||
<h2>Time requested</h2>
|
||||
<p>In total <strong> {{ stats.total_time_requested }} </strong> of music have been requested, with an
|
||||
average song length of <strong>{{ stats.total_average }}</strong>.
|
||||
These are the {{ stats.stats_top_count }} people with the longest total time queued</p>
|
||||
These are the {{ stats.stats_top_count }} people with the longest total time queued.</p>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
@ -148,11 +148,34 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<h2>Most played Artists</h2>
|
||||
<p>These are the {{ stats.stats_top_count }} most played artists ever.</p>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Artist</th>
|
||||
<th style="text-align: right;"># Requests</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for stat in stats.most_played_artists %}
|
||||
<tr>
|
||||
<th>{{ forloop.counter }}</th>
|
||||
<td>{{ stat.song__artist }}</td>
|
||||
<td style="text-align: right;">{{ stat.total }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<h2>Most played uploaders</h2>
|
||||
<p>The left column shows the {{ stats.stats_top_count }} people whose songs are requested most often by other people
|
||||
people. The right column shows how many times that person has queued his own songs.</p>
|
||||
<p>These are the {{ stats.stats_top_count }} people whose songs are requested most often by other people, as shown in the left column. The right column shows how many times that person has queued his own songs.</p>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
|
||||
@ -48,7 +48,30 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<h2>Most played Artists</h2>
|
||||
<h4>Top {{ stats.stats_top_count }}:</h4>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Artist</th>
|
||||
<th style="text-align: right;"># Requests</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for stat in stats.most_played_artists %}
|
||||
<tr>
|
||||
<th>{{ forloop.counter }}</th>
|
||||
<td>{{ stat.song__artist }}</td>
|
||||
<td style="text-align: right;">{{ stat.total }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<h2>Uploads requested</h2>
|
||||
<p> You have uploaded a total of <strong> {{stats.total_uploads }} </strong> songs. The left column
|
||||
@ -82,6 +105,34 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<h2>Upload artists requested</h2>
|
||||
<p> The left column shows how many times songs from artists uploaded by you have been requested by
|
||||
other people. The right column shows how many times you requested those songs.
|
||||
<h4>Top {{ stats.stats_top_count }}:</h4>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Artist</th>
|
||||
<th style="text-align: right;">Others</th>
|
||||
<th>You</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for stat in stats.most_played_uploaded_artists %}
|
||||
<tr>
|
||||
<th>{{ forloop.counter }}</th>
|
||||
<td>{{ stat.song__artist }}</td>
|
||||
<td style="text-align: right;">{{ stat.total }}</td>
|
||||
<td>{{ stat.user_total }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<h2>Most played uploaders</h2>
|
||||
<p> The people whose songs you have queued the most are:</p>
|
||||
@ -107,7 +158,6 @@
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<h2>Biggest fans</h2>
|
||||
<p> The people that queued your songs the most are:</p>
|
||||
|
||||
@ -106,6 +106,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(
|
||||
@ -197,6 +203,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)
|
||||
@ -218,27 +230,37 @@ def user_stats(request):
|
||||
user__id=None).values('song__artist', 'song__title').annotate(
|
||||
total=Count('id', filter=~Q(user__id=request)),
|
||||
user_total=Count('id', filter=Q(user__id=request))).order_by(
|
||||
'-total', 'song__artist',
|
||||
'song__title')
|
||||
'-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
|
||||
total_played = {}
|
||||
total_played['uploads'] = 0
|
||||
total_played['user_uploads'] = 0
|
||||
for x in most_played:
|
||||
total_played_uploads += x['total']
|
||||
total_played_user_uploads += x['user_total']
|
||||
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]
|
||||
most_played_uploaded_artists = sorted(list(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,
|
||||
'stats_top_count': settings.STATS_TOP_COUNT,
|
||||
'total_played_uploads': total_played_uploads,
|
||||
'total_played_user_uploads': total_played_user_uploads,
|
||||
'total_played_uploads': total_played['uploads'],
|
||||
'total_played_user_uploads': total_played['user_uploads'],
|
||||
'biggest_fans': list(biggest_fans),
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user