auracaster/bumble_mirror
3
0
Fork 1
mirror of https://github.com/google/bumble.git synced 2026-05-08 03:58:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

device: simplify and fixes remote name request

Browse Source
This commit is contained in:
Abel Lucas
2022-11-17 03:04:39 +00:00
parent 9c133706e6
commit 5f1d57fcb0
1 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
bumble/device.py
View File

@@ -1764,28 +1764,18 @@ class Device(CompositeEventEmitter):
# Set up event handlers # Set up event handlers
pending_name = asyncio.get_running_loop().create_future() pending_name = asyncio.get_running_loop().create_future()
if type(remote) == Address: peer_address = remote if type(remote) == Address else remote.peer_address
peer_address = remote
handler = self.on( handler = self.on(
'remote_name', 'remote_name',
lambda address, remote_name: lambda address, remote_name:
pending_name.set_result(remote_name) if address == remote else None pending_name.set_result(remote_name) if address == peer_address else None
) )
failure_handler = self.on( failure_handler = self.on(
'remote_name_failure', 'remote_name_failure',
lambda address, error_code: lambda address, error_code:
pending_name.set_exception(HCI_Error(error_code)) if address == remote else None pending_name.set_exception(HCI_Error(error_code)) if address == peer_address else None
) )
else:
peer_address = remote.peer_address
handler = remote.on(
'remote_name',
lambda: pending_name.set_result(remote.peer_name)
)
failure_handler = remote.on(
'remote_name_failure',
lambda error_code: pending_name.set_exception(HCI_Error(error_code))
)
try: try:
result = await self.send_command( result = await self.send_command(
@@ -1804,12 +1794,8 @@ class Device(CompositeEventEmitter):
# Wait for the result # Wait for the result
return await pending_name return await pending_name
finally: finally:
if type(remote) == Address: self.remove_listener('remote_name', handler)
self.remove_listener('remote_name', handler) self.remove_listener('remote_name_failure', failure_handler)
self.remove_listener('remote_name_failure', failure_handler)
else:
remote.remove_listener('remote_name', handler)
remote.remove_listener('remote_name_failure', failure_handler)
# [Classic only] # [Classic only]
@host_event_handler @host_event_handler
@@ -2178,8 +2164,7 @@ class Device(CompositeEventEmitter):
if connection: if connection:
connection.peer_name = remote_name connection.peer_name = remote_name
connection.emit('remote_name') connection.emit('remote_name')
else: self.emit('remote_name', address, remote_name)
self.emit('remote_name', address, remote_name)
except UnicodeDecodeError as error: except UnicodeDecodeError as error:
logger.warning('peer name is not valid UTF-8') logger.warning('peer name is not valid UTF-8')
if connection: if connection:
@@ -2193,8 +2178,7 @@ class Device(CompositeEventEmitter):
def on_remote_name_failure(self, connection, address, error): def on_remote_name_failure(self, connection, address, error):
if connection: if connection:
connection.emit('remote_name_failure', error) connection.emit('remote_name_failure', error)
else: self.emit('remote_name_failure', address, error)
self.emit('remote_name_failure', address, error)
@host_event_handler @host_event_handler
@with_connection_from_handle @with_connection_from_handle