From ac88e7f2cbee459743b505a3df60fab740e9681f Mon Sep 17 00:00:00 2001 From: habi Date: Wed, 6 Apr 2022 14:28:43 +0500 Subject: [PATCH] versionmanagment --- .../baseTemplate/versionManagment.html | 47 ++++++++++--------- baseTemplate/tests.py | 12 ++++- baseTemplate/views.py | 18 ++++++- 3 files changed, 53 insertions(+), 24 deletions(-) diff --git a/baseTemplate/templates/baseTemplate/versionManagment.html b/baseTemplate/templates/baseTemplate/versionManagment.html index a6c60ead9..acd55cc69 100755 --- a/baseTemplate/templates/baseTemplate/versionManagment.html +++ b/baseTemplate/templates/baseTemplate/versionManagment.html @@ -10,6 +10,11 @@

{% trans "Version Management" %}

{% trans "On this page you can manage versions and or upgrade to latest version of CyberPanel" %}

+ {% if Notecheck %} +
+

{% trans "Note: Latest commit does not match, please upgrade.." %}

+
+ {% endif %}
@@ -22,35 +27,38 @@
- -
-
{{ currentVersion }}
-
-
+ +
{{ currentVersion }}
-
- -
-
{{ build }}
-
- -
-
{{ latestVersion }}
-
+ +
{{ build }}
+ +
{{ Currentcomt }}
+ +
+ + + +
+ +
{{ latestVersion }}
+ +
- -
-
{{ latestBuild }}
-
+ +
{{ latestBuild }}
+ +
{{ latestcomit }}
+
@@ -62,9 +70,6 @@ - - -
diff --git a/baseTemplate/tests.py b/baseTemplate/tests.py index 4c524cfea..717b1973d 100755 --- a/baseTemplate/tests.py +++ b/baseTemplate/tests.py @@ -1,17 +1,25 @@ import requests +import json ab = {'package': 'helo world', 'Themename': 'blue-green-theme'} -url= "https://raw.githubusercontent.com/usmannasir/CyberPanel-Themes/main/%s/design.css"%ab['Themename'] +url= "http://cyberpanel.net/version.txt" #url= "https://api.github.com/repos/usmannasir/CyberPanel-Themes/git/commits/def351a6eb4c103fb2dd2acf52396d4ef6111eee" res=requests.get(url) # sha=res.json()[0]['sha'] -print(res.text) +a= res.json()['version'] +print(a) +print(res) + +u = "https://api.github.com/repos/usmannasir/cyberpanel/commits?sha=v%s"%a +r= requests.get(u) + +print(r.text) # l ="https://api.github.com/repos/usmannasir/CyberPanel-Themes/git/trees/%s"%sha # fres=requests.get(l) # diff --git a/baseTemplate/views.py b/baseTemplate/views.py index bfef78bfc..1127a37a5 100755 --- a/baseTemplate/views.py +++ b/baseTemplate/views.py @@ -110,9 +110,25 @@ def versionManagment(request): currentVersion = VERSION currentBuild = str(BUILD) + u = "https://api.github.com/repos/usmannasir/cyberpanel/commits?sha=v%s.%s" % (latestVersion, latestBuild) + logging.CyberCPLogFileWriter.writeToFile(u) + r = requests.get(u) + latestcomit = r.json()[0]['sha'] + + command ="git -C /usr/local/CyberCP/ rev-parse HEAD" + output = ProcessUtilities.outputExecutioner(command) + + Currentcomt = output.rstrip("\n") + notechk = True; + + if(Currentcomt == latestcomit): + notechk = False; + + template = 'baseTemplate/versionManagment.html' finalData = {'build': currentBuild, 'currentVersion': currentVersion, 'latestVersion': latestVersion, - 'latestBuild': latestBuild} + 'latestBuild': latestBuild, 'latestcomit': latestcomit, "Currentcomt": Currentcomt, "Notecheck" : notechk } + proc = httpProc(request, template, finalData, 'versionManagement') return proc.render()