vh/NetAlertX
1
0
Fork 0
mirror of https://github.com/jokob-sk/NetAlertX.git synced 2026-04-08 03:01:29 -07:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

BE: spinner + timestamp work #1251

Browse Source 
Signed-off-by: jokob-sk <jokob.sk@gmail.com>
This commit is contained in:
jokob-sk
2025-11-02 22:12:30 +11:00
parent a27ee5c2f2
commit 7c90c2e93c
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/app_state.py
View File

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

14
server/scan/device_handling.py
View File

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