From 765ab493cb15dfe4c09d1fe818aa47126be8a4e1 Mon Sep 17 00:00:00 2001
From: krateng <git.noreply@krateng.ch>
Date: Tue, 15 Feb 2022 07:18:26 +0100
Subject: [PATCH] Added About page

---
 maloja/database/dbcache.py            |  3 ++-
 maloja/jinjaenv/context.py            |  3 ++-
 maloja/web/jinja/about.jinja          | 34 +++++++++++++++++++++++++++
 maloja/web/jinja/abstracts/base.jinja |  5 ++--
 4 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 maloja/web/jinja/about.jinja

diff --git a/maloja/database/dbcache.py b/maloja/database/dbcache.py
index ac01dab..1206df5 100644
--- a/maloja/database/dbcache.py
+++ b/maloja/database/dbcache.py
@@ -52,11 +52,12 @@ def invalidate_caches(scrobbletime):
 def trim_cache():
 	ramprct = psutil.virtual_memory().percent
 	if ramprct > malojaconfig["DB_MAX_MEMORY"]:
-		log(f"{ramprct}% RAM usage, reducing caches!",module="debug")
+		log(f"{ramprct}% RAM usage, reducing caches!")
 		ratio = (malojaconfig["DB_MAX_MEMORY"] / ramprct) ** 3
 		targetsize = max(int(len(cache) * ratio),100)
 		c.set_size(targetsize)
 		c.set_size(HIGH_NUMBER)
+		log(f"New RAM usage: {psutil.virtual_memory().percent}%")
 
 
 def serialize(obj):
diff --git a/maloja/jinjaenv/context.py b/maloja/jinjaenv/context.py
index 10f1b9e..3990400 100644
--- a/maloja/jinjaenv/context.py
+++ b/maloja/jinjaenv/context.py
@@ -2,7 +2,7 @@ from .. import database_packed
 from . import filters
 from ..globalconf import malojaconfig
 
-from .. import database, database_packed, malojatime, utilities, malojauri, thirdparty
+from .. import database, database_packed, malojatime, utilities, malojauri, thirdparty, __pkginfo__
 from doreah.regular import repeatdaily
 
 import urllib
@@ -32,6 +32,7 @@ def update_jinja_environment():
 		"mlj_uri": malojauri,
 		"settings": malojaconfig,
 		"thirdparty": thirdparty,
+		"pkginfo": __pkginfo__,
 		# external
 		"urllib": urllib,
 		"math":math,
diff --git a/maloja/web/jinja/about.jinja b/maloja/web/jinja/about.jinja
new file mode 100644
index 0000000..589dec1
--- /dev/null
+++ b/maloja/web/jinja/about.jinja
@@ -0,0 +1,34 @@
+{% extends "abstracts/base.jinja" %}
+{% block title %}Maloja - About{% endblock %}
+
+{% block content %}
+<table class="top_info">
+	<tr>
+		<td class="image">
+
+			<div style="background-image:url('/favicon.png');">
+			</div>
+		</td>
+		<td class="text">
+			<h1 class="headerwithextra">Maloja</h1>
+				<br/>
+				<span>Version {{ pkginfo.VERSION }}</span>
+
+			<p class="stats">
+				<a href="https://github.com/krateng/maloja" class="hidelink">
+					<img src="https://img.shields.io/github/v/tag/krateng/maloja?label=GitHub&style=for-the-badge" />
+				</a>
+				<a href="https://pypi.org/project/malojaserver/" class="hidelink">
+					<img src="https://img.shields.io/pypi/v/malojaserver?label=PyPI&style=for-the-badge" />
+				</a>
+				<a href="https://hub.docker.com/r/krateng/maloja" class="hidelink">
+					<img src="https://img.shields.io/docker/v/krateng/maloja?label=Docker&style=for-the-badge" />
+				</a>
+			</p>
+
+
+
+		</td>
+	</tr>
+</table>
+{% endblock %}
diff --git a/maloja/web/jinja/abstracts/base.jinja b/maloja/web/jinja/abstracts/base.jinja
index 8411e93..c3276fa 100644
--- a/maloja/web/jinja/abstracts/base.jinja
+++ b/maloja/web/jinja/abstracts/base.jinja
@@ -48,11 +48,12 @@
 
 		<div class="footer">
 			<div>
-				<span>Get your own charts on
+				<!--<span>Get your own charts on
 					<a target="_blank" rel="noopener noreferrer" href="https://github.com/krateng/maloja">GitHub</a>,
 					<a target="_blank" rel="noopener noreferrer" href="https://pypi.org/project/malojaserver/">PyPI</a> or
 					<a target="_blank" rel="noopener noreferrer" href="https://hub.docker.com/r/krateng/maloja">Dockerhub</a>
-				</span>
+				</span>-->
+				<span><a href="/about">About</a></span>
 			</div>
 			<div>
 				<a href="/"><span style="font-weight:bold;">Maloja {% if settings["DEV_MODE"] %}[Developer Mode]{% endif %}</span></a>