Nemcio/CyberPanel
1
0
Fork 0
mirror of https://github.com/usmannasir/cyberpanel.git synced 2025-11-08 14:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

versionmanagment

Browse Source
This commit is contained in:
habi
2022-04-06 14:28:43 +05:00
parent bcdb0ac595
commit ac88e7f2cb
3 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
baseTemplate/templates/baseTemplate/versionManagment.html
View File

@@ -10,6 +10,11 @@
<h2>{% trans "Version Management" %}</h2>
<p>{% trans "On this page you can manage versions and or upgrade to latest version of CyberPanel" %}</p>
</div>
{% if Notecheck %}
<div class="alert alert-info">
<p style="color:red; font-weight: bold ;">{% trans "Note: Latest commit does not match, please upgrade.." %}</p>
</div>
{% endif %}
<div class="panel">
@@ -22,35 +27,38 @@
<form action="/" class="form-horizontal bordered-row">
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Current Version" %}</label>
<div class="col-sm-6">
<div class="current-pack">{{ currentVersion }} </div>
</div>
</div>
<label class="col-sm-3 control-label " style="margin: 0px!important; padding: 0px!important;">{% trans "Current Version :" %}&nbsp&nbsp</label>
<div class="current-pack col-sm-9" style="margin: 0px!important; padding: 0px!important;">{{ currentVersion }} </div>
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Build" %}</label>
<div class="col-sm-6">
<div class="current-pack">{{ build }}</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Latest Version" %}</label>
<div class="col-sm-6">
<div style="color:red" class="current-pack">{{ latestVersion }}</div>
<label class="col-sm-3 control-label " style="margin: 0px!important; padding: 0px!important;">{% trans "Build :" %}&nbsp&nbsp</label>
<div class="current-pack col-sm-9" style="margin: 0px!important; padding: 0px!important;">{{ build }} </div>
<label class="col-sm-3 control-label " style="margin: 0px!important; padding: 0px!important;">{% trans "Current Commit :" %}&nbsp&nbsp</label>
<div class="current-pack col-sm-9" style="margin: 0px!important; padding: 0px!important;">{{ Currentcomt }} </div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label " style="margin: 0px!important; padding: 0px!important;">{% trans "Latest Version :" %}&nbsp&nbsp</label>
<div class="current-pack col-sm-9" style="margin: 0px!important; padding: 0px!important;">{{ latestVersion }} </div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Latest Build" %}</label>
<div class="col-sm-6">
<div style="color:red" class="current-pack">{{ latestBuild }}</div>
</div>
<label class="col-sm-3 control-label " style="margin: 0px!important; padding: 0px!important;">{% trans "Latest Build :" %}&nbsp&nbsp</label>
<div class="current-pack col-sm-9" style="margin: 0px!important; padding: 0px!important;">{{ latestBuild }} </div>
<label class="col-sm-3 control-label " style="margin: 0px!important; padding: 0px!important;">{% trans "Latest Commit :" %}&nbsp&nbsp</label>
<div class="current-pack col-sm-9" style="margin: 0px!important; padding: 0px!important;">{{ latestcomit }} </div>
</div>
@@ -62,9 +70,6 @@
</form>

12
baseTemplate/tests.py
View File

@@ -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)
#

18
baseTemplate/views.py
View File

@@ -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()