serversdown/series3-watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

fix: update version to v1.4.2 and improve status reporting in tray

Browse Source 
feat: now sends watcher_status via payload to terra-view
This commit is contained in:
serversdwn
2026-03-17 15:23:55 -04:00
parent d2fd3b7182
commit 3303e22843
2 changed files with 55 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
series3_tray.py
View File

@@ -1,5 +1,5 @@
"""
Series 3 Watcher — System Tray Launcher v1.4.1
Series 3 Watcher — System Tray Launcher v1.4.2
Requires: pystray, Pillow, tkinter (stdlib)
Run with: pythonw series3_tray.py (no console window)
@@ -277,46 +277,49 @@ class WatcherTray:
status = self.state.get("status", "starting")
last_err = self.state.get("last_error")
last_scan = self.state.get("last_scan")
api_status = self.state.get("api_status", "disabled")
unit_count = len(self.state.get("units", []))
if status == "error":
return "Status: Error — {}".format(last_err or "unknown")
return "Error — {}".format(last_err or "unknown")
if status == "starting":
return "Status: Starting..."
return "Starting..."
# Scan age
if last_scan is not None:
age_secs = int((datetime.now() - last_scan).total_seconds())
if age_secs < 60:
age_str = "{}s ago".format(age_secs)
else:
age_str = "{}m ago".format(age_secs // 60)
unit_count = len(self.state.get("units", []))
return "Status: {} | {} unit(s) | scan {}".format(
status.upper(), unit_count, age_str
)
return "Status: {}".format(status.upper())
def _build_units_submenu(self):
units = self.state.get("units", [])
if not units:
items = [pystray.MenuItem("No units detected", None, enabled=False)]
age_str = "{}s ago".format(age_secs) if age_secs < 60 else "{}m ago".format(age_secs // 60)
else:
items = []
for u in units:
label = "{uid} — {status} ({age:.1f}h ago)".format(
uid=u["uid"],
status=u["status"],
age=u["age_hours"],
)
items.append(pystray.MenuItem(label, None, enabled=False))
return pystray.Menu(*items)
age_str = "never"
# API status label
if api_status == "ok":
api_str = "API OK"
elif api_status == "fail":
api_str = "API FAIL"
else:
api_str = "API off"
return "Running — {} | {} unit(s) | scan {}".format(api_str, unit_count, age_str)
def _tray_status(self):
"""Return the icon status key based on watcher + API health."""
status = self.state.get("status", "starting")
if status == "error":
return "error"
if status == "starting":
return "starting"
api_status = self.state.get("api_status", "disabled")
if api_status == "fail":
return "missing" # red — API failing
if api_status == "disabled":
return "pending" # amber — running but not reporting
return "ok" # green — running and API good
def _build_menu(self):
# Use a callable for the status item so pystray re-evaluates it
# every time the menu is opened — keeps it in sync with the tooltip.
return pystray.Menu(
pystray.MenuItem(lambda item: self._status_text(), None, enabled=False),
pystray.Menu.SEPARATOR,
pystray.MenuItem("Units", lambda item: self._build_units_submenu()),
pystray.Menu.SEPARATOR,
pystray.MenuItem("Settings...", self._open_settings),
pystray.MenuItem("Open Log Folder", self._open_logs),
pystray.Menu.SEPARATOR,
@@ -331,17 +334,17 @@ class WatcherTray:
update_check_counter = 0 # check for updates every ~5 min (30 * 10s ticks)
while not self.stop_event.is_set():
status = self.state.get("status", "starting")
icon_status = self._tray_status()
if self._icon is not None:
# Always rebuild menu every cycle so unit list and scan age stay fresh
# Always rebuild menu every cycle so status text stays fresh
with self._menu_lock:
self._icon.menu = self._build_menu()
if status != last_status:
self._icon.icon = make_icon(status)
self._icon.title = "Series 3 Watcher — {}".format(status.upper())
last_status = status
if icon_status != last_status:
self._icon.icon = make_icon(icon_status)
self._icon.title = "Series 3 Watcher — {}".format(self._status_text())
last_status = icon_status
# Check if terra-view signalled an update via heartbeat response
if self.state.get("update_available"):