From eb18b1485fb4b9b1d328d23c7c373edb1584d4bf Mon Sep 17 00:00:00 2001 From: Jens Ahrensfeld Date: Thu, 16 Jul 2026 20:43:45 +0200 Subject: [PATCH] network_backend: use resolved device name in console output NetworkBackend's connect/send/lost/error prints always used the connect-time registration name, so GUI console output kept showing the placeholder counter ID even after MON-VER resolved the real device name. Add a display_name per socket (defaults to name, kept separate from the routing key used by find_by_name/register_xcvr) and have the GUI update it once MON-VER responds. Co-Authored-By: Claude Sonnet 5 Claude-Session: https://claude.ai/code/session_01XM4FNUjhu9x8df5Dp1hHvd --- backend/network_backend.py | 15 ++++++++++----- gui/data_model.py | 5 ++++- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/backend/network_backend.py b/backend/network_backend.py index 8f97c81..1704f55 100644 --- a/backend/network_backend.py +++ b/backend/network_backend.py @@ -12,11 +12,16 @@ from backend.a_backend import ABackend class NetworkBackend(ABackend): def __init__(self, servers: list[dict], on_disconnect=None): self.sel = None - self.sock_list = [{'name': s['name'], 'addr': (socket.gethostbyname(s['host']), s['port']), 'xcvr': None, 'queue': Queue()} for s in servers] + self.sock_list = [{'name': s['name'], 'addr': (socket.gethostbyname(s['host']), s['port']), 'xcvr': None, 'queue': Queue(), 'display_name': s['name']} for s in servers] self.thread = Thread(target=self.event_loop) self.loop_enable = True self.on_disconnect = on_disconnect + def set_display_name(self, name: str, display_name: str): + sock = self.find_by_name(name) + if sock is not None: + sock['display_name'] = display_name + def send(self, xcvr: ATransceiver, data: bytes): sock = self.find_by_name(xcvr.name) sock['queue'].put(data) @@ -60,7 +65,7 @@ class NetworkBackend(ABackend): self.sel = selectors.DefaultSelector() events = selectors.EVENT_READ for sock in self.sock_list: - print(f"Starting connection {sock['name']} to {sock['addr']}") + print(f"Starting connection {sock['display_name']} to {sock['addr']}") self.sel.register(sock['sock'], events, data=sock) sock['sock'].connect_ex(sock['addr']) @@ -83,17 +88,17 @@ class NetworkBackend(ABackend): if mask & selectors.EVENT_WRITE: data = sock['queue'].get() key.fileobj.send(data) - print(f"Send: {sock['name']}: {data}") + print(f"Send: {sock['display_name']}: {data}") if sock['queue'].empty(): self.sel.modify(sock['sock'], selectors.EVENT_READ, sock) except OSError as exc: - print(f"Connection {sock['name']} to {sock['addr']} lost: {exc}") + print(f"Connection {sock['display_name']} to {sock['addr']} lost: {exc}") self.sel.unregister(key.fileobj) key.fileobj.close() if self.on_disconnect: self.on_disconnect(sock['name']) except Exception as exc: - print(f"Connection {sock['name']}: error processing data, ignoring: {exc}") + print(f"Connection {sock['display_name']}: error processing data, ignoring: {exc}") except KeyboardInterrupt: print("Caught keyboard interrupt, exiting") diff --git a/gui/data_model.py b/gui/data_model.py index f4ad247..a9320b1 100644 --- a/gui/data_model.py +++ b/gui/data_model.py @@ -253,7 +253,7 @@ class ReceiverManager(QObject): state = self._states.get(rid) if not state or not state.connected: return - print(f"Receiver '{rid}': connection lost") + print(f"Receiver '{self.display_name(rid)}': connection lost") self.remove_receiver(rid) def disconnect_receiver(self, rid: str): @@ -340,6 +340,9 @@ class ReceiverManager(QObject): if state: state.device_id = device_id state.sw_version = sw_version + set_name = getattr(state.backend, 'set_display_name', None) + if device_id and callable(set_name): + set_name(rid, device_id) config = self._configs.get(rid) if config and device_id: config.receiver_id = device_id