From 8cf39adc91ae3f68597701c6b7db204e1cb1a363 Mon Sep 17 00:00:00 2001
From: Krateng <git.noreply@krateng.ch>
Date: Wed, 11 Dec 2019 15:54:59 +0100
Subject: [PATCH] Version now compares to latest pypi release

---
 maloja/__init__.py    |  2 +-
 maloja/web/admin.pyhp | 17 ++++++++++++++---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/maloja/__init__.py b/maloja/__init__.py
index 3ea1919..6f08058 100644
--- a/maloja/__init__.py
+++ b/maloja/__init__.py
@@ -7,7 +7,7 @@ author = {
 	"email":"maloja@krateng.dev",
 	"github": "krateng"
 }
-version = 2,1
+version = 2,1,1
 versionstr = ".".join(str(n) for n in version)
 
 
diff --git a/maloja/web/admin.pyhp b/maloja/web/admin.pyhp
index a1351f2..70c0307 100644
--- a/maloja/web/admin.pyhp
+++ b/maloja/web/admin.pyhp
@@ -10,9 +10,20 @@
 		<pyhp include="common/header.html" />
 
 		<script>
-			neo.xhttprequest("https://maloja.krateng.ch/api/serverinfo",{},"GET",json=true).then((response)=>{
+
+			function versioncompare(a,b) {
+				for (var pos=0;pos<3;pos++) {
+					var v1 = parseInt(a[pos]) || 0;
+					var v2 = parseInt(b[pos]) || 0;
+					if (v1 > v2) { return 1;}
+					if (v1 < v2) { return -1;}
+				}
+
+				return 0;
+			}
+			neo.xhttprequest("https://pypi.org/pypi/malojaserver/json",{},"GET",json=true).then((response)=>{
 				result = JSON.parse(response.responseText);
-				latestvers = result.version;
+				latestvers = result.info.version.split(".");
 
 				neo.xhttprequest("/api/serverinfo",{},"GET",json=true).then((response)=>{
 
@@ -22,7 +33,7 @@
 					document.getElementById("latestversion").innerHTML = latestvers.join(".");
 					document.getElementById("currentversion").innerHTML = thisvers.join(".");
 
-					if (latestvers <= thisvers) {
+					if (versioncompare(latestvers,thisvers) <= 0) {
 						document.getElementById("currentversion").style.color = "green";
 					}
 					else {