Upstream/aioesphomeapi
1
0
Fork 0
mirror of https://github.com/esphome/aioesphomeapi.git synced 2024-06-25 10:26:20 +02:00
Code Issues Projects Releases Wiki Activity

Small speed ups to the bluetooth advertisement converts (#325)

Browse Source
This commit is contained in:
J. Nick Koston 2022-11-30 12:38:09 -10:00 committed by GitHub
parent d3c6cfcacc
commit 585d4cb569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
aioesphomeapi/model.py
View File

@ -758,11 +758,6 @@ class UserService(APIModelBase):
# ==================== BLUETOOTH ====================
def _long_uuid(uuid: str) -> str:
"""Convert a UUID to a long UUID."""
return (
f"0000{uuid[2:].lower()}-0000-1000-8000-00805f9b34fb" if len(uuid) < 8 else uuid
).lower()
def _join_split_uuid(value: List[int]) -> str:
@ -770,8 +765,17 @@ def _join_split_uuid(value: List[int]) -> str:
return str(UUID(int=((value[0] << 64) | value[1])))
def _convert_bluetooth_le_service_uuids(value: List[str]) -> List[str]:
return [_long_uuid(v) for v in value]
# value is likely a google.protobuf.pyext._message.RepeatedScalarContainer
def _convert_bluetooth_le_service_uuids(value: Iterable[str]) -> List[str]:
if not value:
# empty list, don't convert
return []
# Long UUID inlined to avoid call stack inside the list comprehension
return [
f"0000{v[2:].lower()}-0000-1000-8000-00805f9b34fb" if len(v) < 8 else v.lower()
for v in value
]
def _convert_bluetooth_le_service_data(
@ -780,7 +784,14 @@ def _convert_bluetooth_le_service_data(
if isinstance(value, dict):
return value
return {_long_uuid(v.uuid): bytes(v.data if v.data else v.legacy_data) for v in value} # type: ignore
# Long UUID inlined to avoid call stack inside the dict comprehension
return {
f"0000{v.uuid[2:].lower()}-0000-1000-8000-00805f9b34fb" # type: ignore[union-attr]
if len(v.uuid) < 8 # type: ignore[union-attr]
# v.data if v.data else v.legacy_data is backwards compatible with ESPHome devices before 2022.10.0
else v.uuid.lower(): bytes(v.data if v.data else v.legacy_data) # type: ignore[union-attr]
for v in value
}
def _convert_bluetooth_le_manufacturer_data(
@ -788,7 +799,7 @@ def _convert_bluetooth_le_manufacturer_data(
) -> Dict[int, bytes]:
if isinstance(value, dict):
return value
# v.data if v.data else v.legacy_data is backwards compatable with ESPHome devices before 2022.10.0
# v.data if v.data else v.legacy_data is backwards compatible with ESPHome devices before 2022.10.0
return {int(v.uuid, 16): bytes(v.data if v.data else v.legacy_data) for v in value} # type: ignore