From 3a4769cfb2f9e1496c03606fe9517de5dbdf38dc Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Sun, 23 Aug 2020 03:52:11 +0200
Subject: [PATCH] Some cleanup

---
 README.md                              | 2 +-
 maloja/data_files/settings/default.ini | 5 +----
 maloja/database.py                     | 3 ---
 maloja/server.py                       | 4 ++--
 maloja/web/jinja/abstracts/base.jinja  | 2 +-
 5 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 9da1712..cf1d3ee 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@
 
 Simple self-hosted music scrobble database to create personal listening statistics. No recommendations, no social network, no nonsense.
 
-You can check [my own Maloja page](https://maloja.krateng.ch) to see what it looks like.
+You can check [my own Maloja page](https://maloja.krateng.ch) to see what it looks like (it's down fairly often because I use it as staging environment, that doesn't reflect the stability of the Maloja software!).
 
 
 > **IMPORTANT**: With the update 2.0, Maloja has been refactored into a Python package and the old update script no longer works. If you're still on version 1, see [below](#update).
diff --git a/maloja/data_files/settings/default.ini b/maloja/data_files/settings/default.ini
index f5ff205..1bb5f2d 100644
--- a/maloja/data_files/settings/default.ini
+++ b/maloja/data_files/settings/default.ini
@@ -78,9 +78,6 @@ NAME = None
 
 [Misc]
 
-EXPERIMENTAL_FEATURES = no
-USE_PYHP = no #not recommended at the moment
-USE_JINJA = no #overwrites pyhp preference
-FEDERATION = yes #does nothing yet
+USE_JINJA = no
 SKIP_SETUP = no
 LOGGING = true
diff --git a/maloja/database.py b/maloja/database.py
index 5a2fd89..f2e9985 100644
--- a/maloja/database.py
+++ b/maloja/database.py
@@ -247,12 +247,9 @@ def normalize_name(name):
 # an api key now ONLY permits scrobbling tracks, no other admin tasks
 def api_key_correct(request):
 	args = request.query
-	print(dict(args))
 	if "key" in args:
 		apikey = args["key"]
-		print(args)
 		del args["key"]
-		print(args)
 	elif "apikey" in args:
 		apikey = args["apikey"]
 		del args["apikey"]
diff --git a/maloja/server.py b/maloja/server.py
index abc5f14..dc4382f 100755
--- a/maloja/server.py
+++ b/maloja/server.py
@@ -261,7 +261,7 @@ def static_html(name):
 		template = jinjaenv.get_template(name + '.jinja')
 
 		res = template.render(**LOCAL_CONTEXT)
-		log("Generated page {name} in {time:.5f}s (Jinja)".format(name=name,time=clock.stop()),module="debug")
+		log("Generated page {name} in {time:.5f}s (Jinja)".format(name=name,time=clock.stop()),module="debug_performance")
 		return res
 
 
@@ -306,7 +306,7 @@ def static_html(name):
 
 
 			response.set_header("Link",",".join(linkheaders))
-			log("Generated page {name} in {time:.5f}s (Python+HTML)".format(name=name,time=clock.stop()),module="debug")
+			log("Generated page {name} in {time:.5f}s (Python+HTML)".format(name=name,time=clock.stop()),module="debug_performance")
 			return html
 
 		except:
diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja
index 924a989..b6cd9c7 100644
--- a/maloja/web/jinja/abstracts/base.jinja
+++ b/maloja/web/jinja/abstracts/base.jinja
@@ -45,7 +45,7 @@
 
 		<div class="footer">
 			<div>
-				<span>Get your own Maloja scrobble server on <a target="_blank" rel="noopener noreferrer" href="https://github.com/krateng/maloja">GitHub</a></span>
+				<span>Get your own Maloja scrobble server on <a target="_blank" rel="noopener noreferrer" href="https://pypi.org/project/malojaserver/">PyPI</a></span>
 			</div>
 			<div>
 				<a href="/"><span style="font-weight:bold;">Maloja</span></a>