From f1777a5bd2c7949982ae4824a40a8732c965a346 Mon Sep 17 00:00:00 2001 From: Gilles Boccon-Gibod Date: Thu, 21 Sep 2023 19:03:54 -0700 Subject: [PATCH 1/2] use .to_string instead of a manual suffix replacement --- apps/console.py | 2 +- apps/controller_info.py | 3 ++- apps/speaker/speaker.py | 4 ++-- web/scanner/scanner.py | 2 +- web/speaker/speaker.py | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/apps/console.py b/apps/console.py index 0ea9e5b9..2c4974da 100644 --- a/apps/console.py +++ b/apps/console.py @@ -1172,7 +1172,7 @@ class ScanResult: name = '' # Remove any '/P' qualifier suffix from the address string - address_str = str(self.address).replace('/P', '') + address_str = self.address.to_string(False) # RSSI bar bar_string = rssi_bar(self.rssi) diff --git a/apps/controller_info.py b/apps/controller_info.py index 47079837..5be4f3d1 100644 --- a/apps/controller_info.py +++ b/apps/controller_info.py @@ -63,7 +63,8 @@ async def get_classic_info(host): if command_succeeded(response): print() print( - color('Classic Address:', 'yellow'), response.return_parameters.bd_addr + color('Classic Address:', 'yellow'), + response.return_parameters.bd_addr.to_string(False), ) if host.supports_command(HCI_READ_LOCAL_NAME_COMMAND): diff --git a/apps/speaker/speaker.py b/apps/speaker/speaker.py index 1a1eac36..e451c040 100644 --- a/apps/speaker/speaker.py +++ b/apps/speaker/speaker.py @@ -195,7 +195,7 @@ class WebSocketOutput(QueuedOutput): except HCI_StatusError: pass peer_name = '' if connection.peer_name is None else connection.peer_name - peer_address = str(connection.peer_address).replace('/P', '') + peer_address = connection.peer_address.to_string(False) await self.send_message( 'connection', peer_address=peer_address, @@ -376,7 +376,7 @@ class UiServer: if connection := self.speaker().connection: await self.send_message( 'connection', - peer_address=str(connection.peer_address).replace('/P', ''), + peer_address=connection.peer_address.to_string(False), peer_name=connection.peer_name, ) diff --git a/web/scanner/scanner.py b/web/scanner/scanner.py index dd53050b..c0fc4564 100644 --- a/web/scanner/scanner.py +++ b/web/scanner/scanner.py @@ -23,7 +23,7 @@ from bumble.device import Device # ----------------------------------------------------------------------------- class ScanEntry: def __init__(self, advertisement): - self.address = str(advertisement.address).replace("/P", "") + self.address = advertisement.address.to_string(False) self.address_type = ('Public', 'Random', 'Public Identity', 'Random Identity')[ advertisement.address.address_type ] diff --git a/web/speaker/speaker.py b/web/speaker/speaker.py index ddc20864..d9293a4e 100644 --- a/web/speaker/speaker.py +++ b/web/speaker/speaker.py @@ -171,7 +171,7 @@ class Speaker: self.connection = connection connection.on('disconnection', self.on_bluetooth_disconnection) peer_name = '' if connection.peer_name is None else connection.peer_name - peer_address = str(connection.peer_address).replace('/P', '') + peer_address = connection.peer_address.to_string(False) self.emit_event( 'connection', {'peer_name': peer_name, 'peer_address': peer_address} ) From cc96d4245f43c2a7a7d37e72efb11979677766c3 Mon Sep 17 00:00:00 2001 From: Gilles Boccon-Gibod Date: Wed, 27 Sep 2023 21:25:13 -0700 Subject: [PATCH 2/2] address PR comments --- apps/console.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/console.py b/apps/console.py index 2c4974da..9a529dd2 100644 --- a/apps/console.py +++ b/apps/console.py @@ -1172,7 +1172,7 @@ class ScanResult: name = '' # Remove any '/P' qualifier suffix from the address string - address_str = self.address.to_string(False) + address_str = self.address.to_string(with_type_qualifier=False) # RSSI bar bar_string = rssi_bar(self.rssi)