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 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01XM4FNUjhu9x8df5Dp1hHvd
This commit is contained in:
2026-07-16 20:43:45 +02:00
co-authored by Claude Sonnet 5
parent 87d75aafc0
commit eb18b1485f
2 changed files with 14 additions and 6 deletions
+10 -5
View File
@@ -12,11 +12,16 @@ from backend.a_backend import ABackend
class NetworkBackend(ABackend): class NetworkBackend(ABackend):
def __init__(self, servers: list[dict], on_disconnect=None): def __init__(self, servers: list[dict], on_disconnect=None):
self.sel = 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.thread = Thread(target=self.event_loop)
self.loop_enable = True self.loop_enable = True
self.on_disconnect = on_disconnect 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): def send(self, xcvr: ATransceiver, data: bytes):
sock = self.find_by_name(xcvr.name) sock = self.find_by_name(xcvr.name)
sock['queue'].put(data) sock['queue'].put(data)
@@ -60,7 +65,7 @@ class NetworkBackend(ABackend):
self.sel = selectors.DefaultSelector() self.sel = selectors.DefaultSelector()
events = selectors.EVENT_READ events = selectors.EVENT_READ
for sock in self.sock_list: 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) self.sel.register(sock['sock'], events, data=sock)
sock['sock'].connect_ex(sock['addr']) sock['sock'].connect_ex(sock['addr'])
@@ -83,17 +88,17 @@ class NetworkBackend(ABackend):
if mask & selectors.EVENT_WRITE: if mask & selectors.EVENT_WRITE:
data = sock['queue'].get() data = sock['queue'].get()
key.fileobj.send(data) key.fileobj.send(data)
print(f"Send: {sock['name']}: {data}") print(f"Send: {sock['display_name']}: {data}")
if sock['queue'].empty(): if sock['queue'].empty():
self.sel.modify(sock['sock'], selectors.EVENT_READ, sock) self.sel.modify(sock['sock'], selectors.EVENT_READ, sock)
except OSError as exc: 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) self.sel.unregister(key.fileobj)
key.fileobj.close() key.fileobj.close()
if self.on_disconnect: if self.on_disconnect:
self.on_disconnect(sock['name']) self.on_disconnect(sock['name'])
except Exception as exc: 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: except KeyboardInterrupt:
print("Caught keyboard interrupt, exiting") print("Caught keyboard interrupt, exiting")
+4 -1
View File
@@ -253,7 +253,7 @@ class ReceiverManager(QObject):
state = self._states.get(rid) state = self._states.get(rid)
if not state or not state.connected: if not state or not state.connected:
return return
print(f"Receiver '{rid}': connection lost") print(f"Receiver '{self.display_name(rid)}': connection lost")
self.remove_receiver(rid) self.remove_receiver(rid)
def disconnect_receiver(self, rid: str): def disconnect_receiver(self, rid: str):
@@ -340,6 +340,9 @@ class ReceiverManager(QObject):
if state: if state:
state.device_id = device_id state.device_id = device_id
state.sw_version = sw_version 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) config = self._configs.get(rid)
if config and device_id: if config and device_id:
config.receiver_id = device_id config.receiver_id = device_id