mirror of
https://github.com/jokob-sk/NetAlertX.git
synced 2026-04-08 11:11:38 -07:00
BE: spinner + timestamp work #1251
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
@@ -35,7 +35,7 @@ class app_state_class:
|
|||||||
def __init__(self, currentState=None,
|
def __init__(self, currentState=None,
|
||||||
settingsSaved=None,
|
settingsSaved=None,
|
||||||
settingsImported=None,
|
settingsImported=None,
|
||||||
showSpinner=False,
|
showSpinner=None,
|
||||||
graphQLServerStarted=0,
|
graphQLServerStarted=0,
|
||||||
processScan=False,
|
processScan=False,
|
||||||
pluginsStates=None):
|
pluginsStates=None):
|
||||||
@@ -150,7 +150,7 @@ class app_state_class:
|
|||||||
def updateState(newState = None,
|
def updateState(newState = None,
|
||||||
settingsSaved = None,
|
settingsSaved = None,
|
||||||
settingsImported = None,
|
settingsImported = None,
|
||||||
showSpinner = False,
|
showSpinner = None,
|
||||||
graphQLServerStarted = None,
|
graphQLServerStarted = None,
|
||||||
processScan = None,
|
processScan = None,
|
||||||
pluginsStates=None):
|
pluginsStates=None):
|
||||||
|
|||||||
@@ -532,12 +532,14 @@ def update_devices_names(pm):
|
|||||||
last_checked_str = pm.name_plugins_checked
|
last_checked_str = pm.name_plugins_checked
|
||||||
last_checked_dt = parser.parse(last_checked_str) if isinstance(last_checked_str, str) else last_checked_str
|
last_checked_dt = parser.parse(last_checked_str) if isinstance(last_checked_str, str) else last_checked_str
|
||||||
|
|
||||||
# Find the most recent plugin update time among name-related plugins
|
# Collect valid state update timestamps for name-related plugins
|
||||||
state_times = [
|
state_times = []
|
||||||
pm.plugin_states.get(p, {}).get("stateUpdated")
|
for p in name_plugins:
|
||||||
for p in name_plugins
|
state_updated = pm.plugin_states.get(p, {}).get("stateUpdated")
|
||||||
if pm.plugin_states.get(p)
|
if state_updated and state_updated.strip(): # skip empty or None
|
||||||
]
|
state_times.append(state_updated)
|
||||||
|
|
||||||
|
# Determine the latest valid stateUpdated timestamp
|
||||||
latest_state_str = max(state_times, default=None)
|
latest_state_str = max(state_times, default=None)
|
||||||
latest_state_dt = parser.parse(latest_state_str) if latest_state_str else None
|
latest_state_dt = parser.parse(latest_state_str) if latest_state_str else None
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user