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

Performance view on artist page now considers countas rules

Browse Source
This commit is contained in:
Krateng 2019-04-26 17:27:23 +02:00
parent 15103da70b
commit d51441d508
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
website/artist.html
View File

@ -35,7 +35,7 @@
KEY_PULSE KEY_PULSE
</td> </td>
<td> <td>
<h2><a href='/performance?artist=KEY_ENC_ARTISTNAME&step=year&trail=1'>Performance</a></h2> <h2><a href='/performance?artist=KEY_ENC_CREDITEDARTISTNAME&step=year&trail=1'>Performance</a></h2>
KEY_PERFORMANCE KEY_PERFORMANCE
</td> </td>
</tr> </tr>

5
website/artist.py
View File

@ -34,6 +34,8 @@ def instructions(keys):
if credited is not None: if credited is not None:
includestr = "Competing under " + artistLink(credited) + " (" + pos + ")" includestr = "Competing under " + artistLink(credited) + " (" + pos + ")"
pos = "" pos = ""
else:
credited = artist
included = data.get("associated") included = data.get("associated")
if included is not None and included != []: if included is not None and included != []:
includestr = "associated: " includestr = "associated: "
@ -45,11 +47,12 @@ 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) html_performance = module_performance(artist=credited,step="year",stepn=1,trail=1)
replace = { replace = {
"KEY_ARTISTNAME":keys["artist"], "KEY_ARTISTNAME":keys["artist"],
"KEY_ENC_ARTISTNAME":urllib.parse.quote(keys["artist"]), "KEY_ENC_ARTISTNAME":urllib.parse.quote(keys["artist"]),
"KEY_ENC_CREDITEDARTISTNAME":urllib.parse.quote(credited),
"KEY_IMAGEURL":imgurl, "KEY_IMAGEURL":imgurl,
"KEY_DESCRIPTION":"", "KEY_DESCRIPTION":"",
"KEY_MEDALS":html_medals, "KEY_MEDALS":html_medals,