Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Nested loop continue logic fix

Browse Source 
Continue the outer loop, break of the inner loop.

Else you get a usb_dir NoneType exception in os.path.join if there's a device without idProduct, idVendor, bcdDevice sysfs files.

```
Unable to open device <calibre.devices.kindle.driver.KINDLE2 object at 0x7f7a05c23e90>
Traceback (most recent call last):
  File "/usr/lib/calibre/calibre/gui2/device.py", line 201, in do_connect
    dev.open(detected_device, self.current_library_uuid)
  File "/usr/lib/calibre/calibre/devices/usbms/device.py", line 809, in open
    self.open_linux()
  File "/usr/lib/calibre/calibre/devices/usbms/device.py", line 560, in open_linux
    main, carda, cardb = self.find_device_nodes()
  File "/usr/lib/calibre/calibre/devices/usbms/device.py", line 471, in find_device_nodes
    ven, prod, bcd = map(e, ('idVendor', 'idProduct', 'bcdDevice'))
  File "/usr/lib/calibre/calibre/devices/usbms/device.py", line 470, in <lambda>
    e = lambda q : raw2num(open(j(usb_dir, q), 'rb').read().decode('utf-8'))
  File "/usr/lib/python2.7/posixpath.py", line 70, in join
    elif path == '' or path.endswith('/'):
AttributeError: 'NoneType' object has no attribute 'endswith'
```
This commit is contained in:
shastry 2020-09-20 14:35:06 +05:30 committed by GitHub
parent ecfb6fc692
commit fa7d8e30da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/devices/usbms/device.py
View File

@ -466,7 +466,9 @@ class Device(DeviceConfig, DevicePlugin):
for y in ('idProduct', 'idVendor', 'bcdDevice'): for y in ('idProduct', 'idVendor', 'bcdDevice'):
if not os.access(j(usb_dir, y), os.R_OK): if not os.access(j(usb_dir, y), os.R_OK):
usb_dir = None usb_dir = None
continue break
if usb_dir is None:
continue
e = lambda q : raw2num(open(j(usb_dir, q), 'rb').read().decode('utf-8')) e = lambda q : raw2num(open(j(usb_dir, q), 'rb').read().decode('utf-8'))
ven, prod, bcd = map(e, ('idVendor', 'idProduct', 'bcdDevice')) ven, prod, bcd = map(e, ('idVendor', 'idProduct', 'bcdDevice'))
if not (test(ven, 'idVendor') and test(prod, 'idProduct') and if not (test(ven, 'idVendor') and test(prod, 'idProduct') and