Skip to content

bdDetect: Enrich USB serial data with info about USB device #15764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
seanbudd merged 17 commits into from
Nov 23, 2023
Merged

bdDetect: Enrich USB serial data with info about USB device #15764

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
31305ce
Dramatically less complex hwPortUtils code
LeonarddeR Nov 9, 2023
2f831af
Update bdDetect
LeonarddeR Nov 9, 2023
a95bbb6
Lint
LeonarddeR Nov 9, 2023
52436fd
Changelog
LeonarddeR Nov 9, 2023
0825e64
use a separate auto prop on the device cache
LeonarddeR Nov 10, 2023
d1b972c
Merge remote-tracking branch 'origin/master' into enrichtSerialUsb
LeonarddeR Nov 10, 2023
41f167d
Add busReportedDeviceDescription
LeonarddeR Nov 10, 2023
e5939ed
Catch error when no bus description is available
LeonarddeR Nov 11, 2023
9af6394
Apply suggestions from code review
LeonarddeR Nov 14, 2023
2c157dd
more linting
LeonarddeR Nov 15, 2023
4cc8221
Merge branch 'enrichtSerialUsb' of https://github.com/leonardder/nvda…
LeonarddeR Nov 15, 2023
838436a
Merge remote-tracking branch 'origin/master' into enrichtSerialUsb
LeonarddeR Nov 15, 2023
fbb4e87
use a special function
LeonarddeR Nov 15, 2023
639296a
Merge remote-tracking branch 'origin/master' into enrichtSerialUsb
LeonarddeR Nov 22, 2023
81ee6bb
Use F-string in log statement
LeonarddeR Nov 22, 2023
6e4220a
Update source/hwPortUtils.py
LeonarddeR Nov 22, 2023
1d43337
Typo fixes
LeonarddeR Nov 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 19 additions & 5 deletions source/bdDetect.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,7 @@ def getDriversForConnectedUsbDevices(
)
usbComDeviceMatches = (
DeviceMatch(KEY_SERIAL, port["usbID"], port["port"], port)
for port in deviceInfoFetcher.comPorts
if "usbID" in port
for port in deviceInfoFetcher.usbComPorts
)
# Tee is used to ensure that the DeviceMatches aren't created multiple times.
# The processing of these HID device matches, looking for a custom driver, means that all
Expand Down Expand Up @@ -234,9 +233,9 @@ def _set_btDevsCache(
self._btDevsCache = cache.copy() if cache else None

#: Type info for auto property: _get_comPorts
comPorts: List[Dict]
comPorts: list[dict[str, str]]

def _get_comPorts(self) -> List[Dict]:
def _get_comPorts(self) -> list[dict[str, str]]:
return list(hwPortUtils.listComPorts(onlyAvailable=True))

#: Type info for auto property: _get_usbDevices
Expand All @@ -245,6 +244,21 @@ def _get_comPorts(self) -> List[Dict]:
def _get_usbDevices(self) -> List[Dict]:
return list(hwPortUtils.listUsbDevices(onlyAvailable=True))

#: Type info for auto property: _get_usbComPorts
usbComPorts: list[dict[str, str]]

def _get_usbComPorts(self) -> list[dict[str, str]]:
comPorts = []
for port in self.comPorts:
if (usbId := port.get("usbID")) is None:
continue
if (usbDict := next(
(d for d in self.usbDevices if d.get("usbID") == usbId),
None
)) is not None:
comPorts.append(port | usbDict)
return comPorts

#: Type info for auto property: _get_hidDevices
hidDevices: List[Dict]

Expand Down Expand Up @@ -432,7 +446,7 @@ def getConnectedUsbDevicesForDriver(driver: str) -> Iterator[DeviceMatch]:
),
(
DeviceMatch(KEY_SERIAL, port["usbID"], port["port"], port)
for port in deviceInfoFetcher.comPorts if "usbID" in port
for port in deviceInfoFetcher.usbComPorts
)
)
for match in usbDevs:
Expand Down
Loading