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

...

Browse Source
This commit is contained in:
Kovid Goyal 2016-01-18 08:18:30 +05:30
parent 4f5146e2ea
commit b8fe3e52c9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/devices/winusb.py
View File

@ -338,7 +338,7 @@ def iterchildren(parent_devinst):
if err.winerror == NO_MORE: if err.winerror == NO_MORE:
return return
raise raise
yield child yield child.value
while True: while True:
try: try:
CM_Get_Sibling(byref(child), child, 0) CM_Get_Sibling(byref(child), child, 0)
@ -346,7 +346,7 @@ def iterchildren(parent_devinst):
if err.winerror == NO_MORE: if err.winerror == NO_MORE:
break break
raise raise
yield child yield child.value
def iterdescendants(parent_devinst): def iterdescendants(parent_devinst):
for child in iterchildren(parent_devinst): for child in iterchildren(parent_devinst):
@ -493,7 +493,7 @@ def get_removable_drives(debug=False): # {{{
except WindowsError: except WindowsError:
break break
try: try:
devid, buf = get_device_id(parent, buf=buf) devid, buf = get_device_id(parent.value, buf=buf)
except WindowsError: except WindowsError:
break break
candidates.append(devid) candidates.append(devid)
@ -541,10 +541,12 @@ def get_drive_letters_for_device(vendor_id, product_id, bcd=None, debug=False):
for devinst in iterdescendants(devinfo.DevInst): for devinst in iterdescendants(devinfo.DevInst):
devid, wbuf = get_device_id(devinst, buf=wbuf) devid, wbuf = get_device_id(devinst, buf=wbuf)
try: try:
drive_letter = find_drive(devinst.value, sn_map, debug=debug) drive_letter = find_drive(devinst, sn_map, debug=debug)
except Exception as err: except Exception as err:
if debug: if debug:
prints('Failed to get drive letter for: %s with error: %s' % (devid, as_unicode(err))) prints('Failed to get drive letter for: %s with error: %s' % (devid, as_unicode(err)))
import traceback
traceback.print_exc()
else: else:
if drive_letter: if drive_letter:
ans.append(drive_letter) ans.append(drive_letter)