Skip to content

Fix handling of USB devices with numeric serial strings #321

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

Open
enkiusz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix handling of USB devices with numeric serial strings #321

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 20 additions & 15 deletions pyftdi/usbtools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,6 +384,15 @@ def enumerate_candidates(cls, urlparts: SplitResult,
except (IndexError, ValueError) as exc:
raise UsbToolsError('Invalid device URL: %s' %
urlunsplit(urlparts)) from exc

vendors = [vendor] if vendor else set(vdict.values())
vps = set()
for vid in vendors:
products = pdict.get(vid, [])
for pid in products:
vps.add((vid, products[pid]))
devices = cls.find_all(vps)

sernum = None
idx = None
bus = None
Expand All @@ -398,23 +407,19 @@ def enumerate_candidates(cls, urlparts: SplitResult,
':'.join(locators)) from exc
else:
if locators and locators[0]:
try:
devidx = to_int(locators[0])
if devidx > 255:
raise ValueError()
idx = devidx
if idx:
idx = devidx-1
except ValueError:
if locators[0] in [dev.sn for dev, _ in devices]:
sernum = locators[0]
else:
try:
devidx = to_int(locators[0])
if devidx > 255:
raise ValueError()
idx = devidx
if idx:
idx = devidx-1
except ValueError:
raise UsbToolsError('Invalid index: %s' % ':'.join(locators))
candidates = []
vendors = [vendor] if vendor else set(vdict.values())
vps = set()
for vid in vendors:
products = pdict.get(vid, [])
for pid in products:
vps.add((vid, products[pid]))
devices = cls.find_all(vps)
if sernum:
if sernum not in [dev.sn for dev, _ in devices]:
raise UsbToolsError("No USB device with S/N %s" % sernum)
Expand Down