feat: Add git version to status route
All checks were successful
Tests and Linting / Tests-Linting (3.11) (push) Successful in 30s
Tests and Linting / Tests-Linting (3.10) (push) Successful in 35s
Tests and Linting / Tests-Linting (3.13) (push) Successful in 36s
Build Docker / Build Images (map[dockerfile:Dockerfile.hsd tag_suffix:-hsd target:hsd]) (push) Successful in 46s
Build Docker / Build Images (map[dockerfile:Dockerfile tag_suffix: target:default]) (push) Successful in 52s
All checks were successful
Tests and Linting / Tests-Linting (3.11) (push) Successful in 30s
Tests and Linting / Tests-Linting (3.10) (push) Successful in 35s
Tests and Linting / Tests-Linting (3.13) (push) Successful in 36s
Build Docker / Build Images (map[dockerfile:Dockerfile.hsd tag_suffix:-hsd target:hsd]) (push) Successful in 46s
Build Docker / Build Images (map[dockerfile:Dockerfile tag_suffix: target:default]) (push) Successful in 52s
This commit is contained in:
50
main.py
50
main.py
@@ -1876,7 +1876,8 @@ def api_status():
|
|||||||
}
|
}
|
||||||
status = 200
|
status = 200
|
||||||
error = None
|
error = None
|
||||||
node_status['version'] = account_module.hsdVersion(False) # type: ignore
|
node_status['version'] = account_module.hsdVersion(False)
|
||||||
|
|
||||||
|
|
||||||
if node_status['internal']:
|
if node_status['internal']:
|
||||||
node_status['internal_running'] = account_module.hsdRunning()
|
node_status['internal_running'] = account_module.hsdRunning()
|
||||||
@@ -1892,9 +1893,15 @@ def api_status():
|
|||||||
error = "Internal node not running"
|
error = "Internal node not running"
|
||||||
status = 503
|
status = 503
|
||||||
|
|
||||||
|
commit = currentCurrentCommit()
|
||||||
return jsonify({
|
return jsonify({
|
||||||
"node": node_status,
|
"node": node_status,
|
||||||
|
"version": {
|
||||||
|
"commit": commit,
|
||||||
|
"branch": currentCurrentBranch(),
|
||||||
|
"latest": runningLatestVersion(),
|
||||||
|
"url": f"https://git.woodburn.au/nathanwoodburn/firewalletbrowser/commit/{commit}" if commit != "Error" else None
|
||||||
|
},
|
||||||
"error": error,
|
"error": error,
|
||||||
"status": status
|
"status": status
|
||||||
}), status
|
}), status
|
||||||
@@ -1942,6 +1949,45 @@ def renderDomain(name: str) -> str:
|
|||||||
except Exception:
|
except Exception:
|
||||||
return f"{name}/"
|
return f"{name}/"
|
||||||
|
|
||||||
|
def currentCurrentCommit() -> str:
|
||||||
|
"""
|
||||||
|
Get the current commit of the application.
|
||||||
|
"""
|
||||||
|
if not os.path.exists(".git"):
|
||||||
|
return "Error"
|
||||||
|
info = gitinfo.get_git_info()
|
||||||
|
if info is None:
|
||||||
|
return "Error"
|
||||||
|
commit = info['commit']
|
||||||
|
return commit
|
||||||
|
|
||||||
|
def currentCurrentBranch() -> str:
|
||||||
|
"""
|
||||||
|
Get the current branch of the application.
|
||||||
|
"""
|
||||||
|
if not os.path.exists(".git"):
|
||||||
|
return "Error"
|
||||||
|
info = gitinfo.get_git_info()
|
||||||
|
if info is None:
|
||||||
|
return "Error"
|
||||||
|
branch = info['refs']
|
||||||
|
return branch
|
||||||
|
|
||||||
|
def runningLatestVersion() -> bool:
|
||||||
|
"""
|
||||||
|
Check if the current version is the latest version.
|
||||||
|
"""
|
||||||
|
if not os.path.exists(".git"):
|
||||||
|
return False
|
||||||
|
info = gitinfo.get_git_info()
|
||||||
|
if info is None:
|
||||||
|
return False
|
||||||
|
branch = info['refs']
|
||||||
|
commit = info['commit']
|
||||||
|
if commit != latestVersion(branch):
|
||||||
|
return False
|
||||||
|
return True
|
||||||
|
|
||||||
def get_alerts(account:str) -> list:
|
def get_alerts(account:str) -> list:
|
||||||
"""
|
"""
|
||||||
Get alerts to show on the dashboard.
|
Get alerts to show on the dashboard.
|
||||||
|
|||||||
Reference in New Issue
Block a user