Cutlery/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2025-07-31 14:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restored more associated artists functionality

Browse Source
This commit is contained in:
krateng 2023-10-18 13:27:38 +02:00
parent 22495692fb
commit b5a9f41096
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
maloja/database/__init__.py
View File

@ -374,6 +374,9 @@ def get_charts_artists(dbconn=None,resolve_ids=True,**keys):
(since,to) = keys.get('timerange').timestamps() (since,to) = keys.get('timerange').timestamps()
associated = keys.get('associated',True) associated = keys.get('associated',True)
result = sqldb.count_scrobbles_by_artist(since=since,to=to,resolve_ids=resolve_ids,associated=associated,dbconn=dbconn) result = sqldb.count_scrobbles_by_artist(since=since,to=to,resolve_ids=resolve_ids,associated=associated,dbconn=dbconn)
for entry in result:
if "artist" in entry:
entry['associated_artists'] = sqldb.get_associated_artists(entry['artist'])
return result return result
@waitfordb @waitfordb
@ -458,7 +461,7 @@ def get_top_artists(dbconn=None,**keys):
for rng in rngs: for rng in rngs:
try: try:
res = get_charts_artists(timerange=rng,dbconn=dbconn)[0] res = get_charts_artists(timerange=rng,dbconn=dbconn)[0]
results.append({"range":rng,"artist":res["artist"],"scrobbles":res["scrobbles"]}) results.append({"range":rng,"artist":res["artist"],"scrobbles":res["scrobbles"],"associated_artists":sqldb.get_associated_artists(res["artist"])})
except Exception: except Exception:
results.append({"range":rng,"artist":None,"scrobbles":0}) results.append({"range":rng,"artist":None,"scrobbles":0})

2
maloja/web/jinja/partials/charts_artists.jinja
View File

@ -49,7 +49,7 @@
{% endif %} {% endif %}
<!-- artist --> <!-- artist -->
{{ entityrow.row(e['artist'],adminmode=adminmode) }} {{ entityrow.row(e['artist'],adminmode=adminmode,counting=e.associated_artists) }}
<!-- scrobbles --> <!-- scrobbles -->
<td class="amount">{{ links.link_scrobbles([{'artist':e['artist'],'associated':True,'timerange':limitkeys.timerange}],amount=e['scrobbles']) }}</td> <td class="amount">{{ links.link_scrobbles([{'artist':e['artist'],'associated':True,'timerange':limitkeys.timerange}],amount=e['scrobbles']) }}</td>

6
maloja/web/jinja/partials/top_artists.jinja
View File

@ -20,9 +20,9 @@
<td class='amount'>0</td> <td class='amount'>0</td>
<td class='bar'></td> <td class='bar'></td>
{% else %} {% else %}
{{ entityrow.row(artist) }} {{ entityrow.row(artist,counting=e.associated_artists) }}
<td class='amount'>{{ links.link_scrobbles([{'artist':artist,'timerange':thisrange}],amount=e.scrobbles) }}</td> <td class='amount'>{{ links.link_scrobbles([{'artist':artist,'timerange':thisrange,'associated':True}],amount=e.scrobbles) }}</td>
<td class='bar'> {{ links.link_scrobbles([{'artist':artist,'timerange':thisrange}],percent=e.scrobbles*100/maxbar) }}</td> <td class='bar'> {{ links.link_scrobbles([{'artist':artist,'timerange':thisrange,'associated':True}],percent=e.scrobbles*100/maxbar) }}</td>
{% endif %} {% endif %}
</tr> </tr>