mirror/maloja
1
0
Fork 0
mirror of https://github.com/krateng/maloja.git synced 2023-08-10 21:12:55 +03:00
Code Issues Projects Releases Wiki Activity

Now showing performance on artist / track overview page

Browse Source
This commit is contained in:
Krateng 2019-04-23 18:08:37 +02:00
parent 8b8470439c
commit 3ee7cd515a
5 changed files with 38 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
website/artist.html
View File

@ -28,9 +28,19 @@
<h2><a href='/charts_tracks?artist=KEY_ENC_ARTISTNAME'>Top Tracks</a></h2> <h2><a href='/charts_tracks?artist=KEY_ENC_ARTISTNAME'>Top Tracks</a></h2>
KEY_TRACKLIST KEY_TRACKLIST
<table class="twopart">
<tr>
<td>
<h2><a href='/pulse?artist=KEY_ENC_ARTISTNAME&step=year&trail=1'>Pulse</a></h2>
KEY_PULSE
</td>
<td>
<h2><a href='/performance?artist=KEY_ENC_ARTISTNAME&step=year&trail=1'>Performance</a></h2>
KEY_PERFORMANCE
</td>
</tr>
</table>
<h2><a href='/pulse?artist=KEY_ENC_ARTISTNAME&step=year&trail=1'>Pulse</a></h2>
KEY_PULSE
<h2><a href='/scrobbles?KEY_SCROBBLELINK'>Last Scrobbles</a></h2> <h2><a href='/scrobbles?KEY_SCROBBLELINK'>Last Scrobbles</a></h2>
KEY_SCROBBLELIST KEY_SCROBBLELIST

4
website/artist.py
View File

@ -6,7 +6,7 @@ def instructions(keys):
from utilities import getArtistImage from utilities import getArtistImage
from htmlgenerators import artistLink, artistLinks from htmlgenerators import artistLink, artistLinks
from urihandler import compose_querystring, uri_to_internal from urihandler import compose_querystring, uri_to_internal
from htmlmodules import module_pulse, module_trackcharts, module_scrobblelist from htmlmodules import module_pulse, module_performance, module_trackcharts, module_scrobblelist
filterkeys, _, _, _ = uri_to_internal(keys,forceArtist=True) filterkeys, _, _, _ = uri_to_internal(keys,forceArtist=True)
artist = filterkeys.get("artist") artist = filterkeys.get("artist")
@ -45,6 +45,7 @@ def instructions(keys):
html_scrobbles, _, _ = module_scrobblelist(artist=artist,max_=10,earlystop=True) html_scrobbles, _, _ = module_scrobblelist(artist=artist,max_=10,earlystop=True)
html_pulse = module_pulse(**filterkeys,step="year",stepn=1,trail=1) html_pulse = module_pulse(**filterkeys,step="year",stepn=1,trail=1)
html_performance = module_performance(**filterkeys,step="year",stepn=1,trail=1)
replace = { replace = {
"KEY_ARTISTNAME":keys["artist"], "KEY_ARTISTNAME":keys["artist"],
@ -54,6 +55,7 @@ def instructions(keys):
"KEY_MEDALS":html_medals, "KEY_MEDALS":html_medals,
"KEY_TRACKLIST":html_tracks, "KEY_TRACKLIST":html_tracks,
"KEY_PULSE":html_pulse, "KEY_PULSE":html_pulse,
"KEY_PERFORMANCE":html_performance,
"KEY_SCROBBLES":scrobbles, "KEY_SCROBBLES":scrobbles,
"KEY_SCROBBLELIST":html_scrobbles, "KEY_SCROBBLELIST":html_scrobbles,
"KEY_SCROBBLELINK":compose_querystring(keys), "KEY_SCROBBLELINK":compose_querystring(keys),

6
website/css/maloja.css
View File

@ -371,6 +371,12 @@ span.stat_selector_pulse,span.stat_selector_topartists,span.stat_selector_toptra
** **
*/ */
table.twopart {
width:100%;
}
table.twopart>tr>td {
width:50%;
}

13
website/track.html
View File

@ -27,6 +27,19 @@
<h2><a href='/pulse?KEY_SCROBBLELINK&step=year&trail=1'>Pulse</a></h2> <h2><a href='/pulse?KEY_SCROBBLELINK&step=year&trail=1'>Pulse</a></h2>
KEY_PULSE KEY_PULSE
<table class="twopart">
<tr>
<td>
<h2><a href='/pulse?KEY_SCROBBLELINK&step=year&trail=1'>Pulse</a></h2>
KEY_PULSE
</td>
<td>
<h2><a href='/pulse?KEY_SCROBBLELINK&step=year&trail=1'>Pulse</a></h2>
KEY_PERFORMANCE
</td>
</tr>
</table>
<h2><a href='/scrobbles?KEY_SCROBBLELINK'>Last Scrobbles</a></h2> <h2><a href='/scrobbles?KEY_SCROBBLELINK'>Last Scrobbles</a></h2>
KEY_SCROBBLELIST KEY_SCROBBLELIST

6
website/track.py
View File

@ -6,7 +6,7 @@ def instructions(keys):
from utilities import getArtistImage, getTrackImage from utilities import getArtistImage, getTrackImage
from htmlgenerators import artistLinks from htmlgenerators import artistLinks
from urihandler import compose_querystring, uri_to_internal from urihandler import compose_querystring, uri_to_internal
from htmlmodules import module_scrobblelist, module_pulse from htmlmodules import module_scrobblelist, module_pulse, module_performance
filterkeys, _, _, _ = uri_to_internal(keys,forceTrack=True) filterkeys, _, _, _ = uri_to_internal(keys,forceTrack=True)
@ -38,6 +38,7 @@ def instructions(keys):
html_scrobbles, _, _ = module_scrobblelist(track=track,max_=10,earlystop=True) # we have the number already from the trackinfo html_scrobbles, _, _ = module_scrobblelist(track=track,max_=10,earlystop=True) # we have the number already from the trackinfo
html_pulse = module_pulse(track=track,step="year",stepn=1,trail=1) html_pulse = module_pulse(track=track,step="year",stepn=1,trail=1)
html_performance = module_performance(track=track,step="year",stepn=1,trail=1)
replace = { replace = {
@ -49,7 +50,8 @@ def instructions(keys):
"KEY_SCROBBLELINK":compose_querystring(keys), "KEY_SCROBBLELINK":compose_querystring(keys),
"KEY_MEDALS":html_medals, "KEY_MEDALS":html_medals,
"KEY_SCROBBLELIST":html_scrobbles, "KEY_SCROBBLELIST":html_scrobbles,
"KEY_PULSE":html_pulse "KEY_PULSE":html_pulse,
"KEY_PERFORMANCE":html_performance
} }
return (replace,pushresources) return (replace,pushresources)