ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added uptime display to Settings page.

This commit is contained in:
Marat Fayzullin 2025-01-21 18:44:59 -05:00
parent b9bffb8a9f
commit 404db099fd
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
owrx/controllers/services.py
View File

@ -5,6 +5,7 @@ from owrx.service import Services
from owrx.repeaters import Repeaters
from owrx.eibi import EIBI
from datetime import datetime
import json
import re
@ -44,18 +45,22 @@ class ServiceController(AuthorizationMixin, WebpageController):
@staticmethod
def renderStatus():
result = ""
ts = Repeaters.lastDownloaded()
if ts > 0:
ts = datetime.fromtimestamp(ts).strftime("%H:%M:%S, %m/%d/%Y")
result += "<div style='color:#00FF00;text-align:center;'>Repeaters database downloaded at {0}.</div>\n".format(ts)
else:
result += "<div style='color:#FF0000;text-align:center;'>Repeaters database not downloaded.</div>\n"
ts = datetime.fromtimestamp(EIBI.lastStarted())
td = str(datetime.now() - ts).split(".", 1)[0]
ts = ts.astimezone().strftime("%H:%M:%S %Z, %d %b %Y")
result += "<div style='color:#00FF00;text-align:center;'>Server started at {0}, {1} ago.</div>\n".format(ts, td)
ts = EIBI.lastDownloaded()
if ts > 0:
ts = datetime.fromtimestamp(ts).strftime("%H:%M:%S, %m/%d/%Y")
ts = datetime.fromtimestamp(ts).astimezone().strftime("%H:%M:%S %Z, %d %b %Y")
result += "<div style='color:#00FF00;text-align:center;'>Shortwave schedule downloaded at {0}.</div>\n".format(ts)
else:
result += "<div style='color:#FF0000;text-align:center;'>Shortwave schedule not downloaded.</div>\n"
ts = Repeaters.lastDownloaded()
if ts > 0:
ts = datetime.fromtimestamp(ts).astimezone().strftime("%H:%M:%S %Z, %d %b %Y")
result += "<div style='color:#00FF00;text-align:center;'>Repeaters database downloaded at {0}.</div>\n".format(ts)
else:
result += "<div style='color:#FF0000;text-align:center;'>Repeaters database not downloaded.</div>\n"
return result
@staticmethod

6
owrx/eibi.py
View File

@ -24,6 +24,7 @@ MAX_DISTANCE = 25000
class EIBI(object):
sharedInstance = None
creationLock = threading.Lock()
timeStarted = time.time()
@staticmethod
def getSharedInstance():
@ -37,6 +38,11 @@ class EIBI(object):
coreConfig = CoreConfig()
return "{data_directory}/eibi.json".format(data_directory=coreConfig.get_data_directory())
# Get last started timestamp
@staticmethod
def lastStarted():
return EIBI.timeStarted
# Get last downloaded timestamp or 0 for none
@staticmethod
def lastDownloaded():