From a5b407d92fc057fb16498ced7b76af0691ed86eb Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Wed, 20 Nov 2019 22:14:49 +0100
Subject: [PATCH] Fixed various issues with pyhp files

---
 requirements.txt    |  2 +-
 website/artist.pyhp | 14 ++++----------
 website/track.pyhp  | 14 ++++----------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9dd1d56..4beb6ff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 bottle>=0.12.16
 waitress>=1.3
-doreah>=1.2
+doreah>=1.2.5
 nimrodel>=0.4.9
 setproctitle>=1.1.10
 wand>=0.5.4
diff --git a/website/artist.pyhp b/website/artist.pyhp
index 1f8cbb8..b44af60 100644
--- a/website/artist.pyhp
+++ b/website/artist.pyhp
@@ -10,7 +10,7 @@
 	<pyhp save="info.get('replace')" as="credited" />
 	<pyhp save="info.get('associated')" as="included" />
 	<pyhp save="'#' + str(info.get('position'))" as="positionstring" />
-	<pyhp save="'months'" as="initialrange" />
+	<pyhp save="'month'" as="initialrange" />
 
 	<!-- includestring -->
 	<pyhp save="''" as="includestring" />
@@ -57,15 +57,9 @@
 					<span><pyhp echo="includestring" /></span>
 					<p class="stats"><a href="/scrobbles?{encodedartist}"><pyhp echo="info['scrobbles']" /> Scrobbles</a></p>
 
-					<pyhp for="year" in="info['medals']['gold']">
-						<a title="Best Artist in {year}" class="hidelink medal shiny gold" href='/charts_artists?max=50&amp;in=" + str(year) + "'><span><pyhp echo="year" /></span></a>
-					</pyhp>
-					<pyhp for="year" in="info['medals']['silver']">
-						<a title="Second best Artist in {year}" class="hidelink medal shiny silver" href='/charts_artists?max=50&amp;in=" + str(year) + "'><span><pyhp echo="year" /></span></a>
-					</pyhp>
-					<pyhp for="year" in="info['medals']['bronze']">
-						<a title="Third best Artist in {year}" class="hidelink medal shiny bronze" href='/charts_artists?max=50&amp;in=" + str(year) + "'><span><pyhp echo="year" /></span></a>
-					</pyhp>
+					<pyhp for="year" in="info['medals']['gold']"><a title="Best Artist in {year}" class="hidelink medal shiny gold" href='/charts_artists?max=50&amp;in={str(year)}'><span><pyhp echo="year" /></span></a></pyhp>
+					<pyhp for="year" in="info['medals']['silver']"><a title="Second best Artist in {year}" class="hidelink medal shiny silver" href='/charts_artists?max=50&amp;in={str(year)}'><span><pyhp echo="year" /></span></a></pyhp>
+					<pyhp for="year" in="info['medals']['bronze']"><a title="Third best Artist in {year}" class="hidelink medal shiny bronze" href='/charts_artists?max=50&amp;in={str(year)}'><span><pyhp echo="year" /></span></a></pyhp>
 
 
 				</td>
diff --git a/website/track.pyhp b/website/track.pyhp
index d8abdea..356693b 100644
--- a/website/track.pyhp
+++ b/website/track.pyhp
@@ -8,7 +8,7 @@
 	<pyhp save="db.trackInfo(track)" as="info" />
 	<!-- preprocessing -->
 	<pyhp save="'#' + str(info.get('position'))" as="positionstring" />
-	<pyhp save="'months'" as="initialrange" />
+	<pyhp save="'month'" as="initialrange" />
 	<!-- url encode -->
 	<pyhp save="urihandler.compose_querystring(urihandler.internal_to_uri({'track':track}))" as="encodedtrack" />
 
@@ -33,15 +33,9 @@
 
 					<p class="stats"><a href="/scrobbles?{encodedtrack}"><pyhp echo="info['scrobbles']" /> Scrobbles</a></p>
 
-					<pyhp for="year" in="info['medals']['gold']">
-						<a title="Best Artist in {year}" class="hidelink medal shiny gold" href='/charts_artists?max=50&amp;in=" + str(year) + "'><span><pyhp echo="year" /></span></a>
-					</pyhp>
-					<pyhp for="year" in="info['medals']['silver']">
-						<a title="Second best Artist in {year}" class="hidelink medal shiny silver" href='/charts_artists?max=50&amp;in=" + str(year) + "'><span><pyhp echo="year" /></span></a>
-					</pyhp>
-					<pyhp for="year" in="info['medals']['bronze']">
-						<a title="Third best Artist in {year}" class="hidelink medal shiny bronze" href='/charts_artists?max=50&amp;in=" + str(year) + "'><span><pyhp echo="year" /></span></a>
-					</pyhp>
+					<pyhp for="year" in="info['medals']['gold']"><a title="Best Artist in {year}" class="hidelink medal shiny gold" href='/charts_artists?max=50&amp;in={str(year)}'><span><pyhp echo="year" /></span></a></pyhp>
+					<pyhp for="year" in="info['medals']['silver']"><a title="Second best Artist in {year}" class="hidelink medal shiny silver" href='/charts_artists?max=50&amp;in={str(year)}'><span><pyhp echo="year" /></span></a></pyhp>
+					<pyhp for="year" in="info['medals']['bronze']"><a title="Third best Artist in {year}" class="hidelink medal shiny bronze" href='/charts_artists?max=50&amp;in={str(year)}'><span><pyhp echo="year" /></span></a></pyhp>
 				</td>
 			</tr>
 		</table>