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

...

Browse Source
This commit is contained in:
Kovid Goyal 2009-06-03 13:40:24 -07:00
parent 2815d05ccc
commit dc83803252
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/debug.py
View File

@ -87,6 +87,7 @@ def migrate(old, new):
print 'Database migrated to', os.path.abspath(new) print 'Database migrated to', os.path.abspath(new)
def debug_device_driver(): def debug_device_driver():
from calibre.customize.ui import device_plugins
from calibre.devices.scanner import DeviceScanner from calibre.devices.scanner import DeviceScanner
s = DeviceScanner() s = DeviceScanner()
s.scan() s.scan()
@ -113,17 +114,15 @@ def debug_device_driver():
raw = Device.run_ioreg() raw = Device.run_ioreg()
open('/tmp/ioreg.txt', 'wb').write(raw) open('/tmp/ioreg.txt', 'wb').write(raw)
print 'ioreg output saved to /tmp/ioreg.txt' print 'ioreg output saved to /tmp/ioreg.txt'
from calibre.devices import devices for dev in device_plugins():
for dev in devices(): print 'Looking for', dev.__class__.__name__
print 'Looking for', dev.__name__
connected = s.is_device_connected(dev) connected = s.is_device_connected(dev)
if connected: if connected:
print 'Device Connected:', dev print 'Device Connected:', dev
print 'Trying to open device...' print 'Trying to open device...'
d = dev() dev.open()
d.open() print 'Main memory:', repr(dev._main_prefix)
print 'Main memory:', repr(d._main_prefix) print 'Total space:', dev.total_space()
print 'Total space:', d.total_space()
break break
def add_simple_plugin(path_to_plugin): def add_simple_plugin(path_to_plugin):

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

@ -342,6 +342,7 @@ class Device(DeviceConfig, DevicePlugin):
break break
else: else:
break break
if usb_dir is None: if usb_dir is None:
raise DeviceError(_('Unable to detect the %s disk drive.') raise DeviceError(_('Unable to detect the %s disk drive.')
%self.__class__.__name__) %self.__class__.__name__)
@ -363,8 +364,8 @@ class Device(DeviceConfig, DevicePlugin):
ok[node] = False ok[node] = False
except: except:
ok[node] = False ok[node] = False
devnodes.append(node) if ok[node]:
devnodes.sort() devnodes.append(node)
devnodes += list(repeat(None, 3)) devnodes += list(repeat(None, 3))
return tuple(['/dev/'+x if ok.get(x, False) else None for x in devnodes[:3]]) return tuple(['/dev/'+x if ok.get(x, False) else None for x in devnodes[:3]])
@ -459,7 +460,6 @@ class Device(DeviceConfig, DevicePlugin):
setattr(self, prefix, mp) setattr(self, prefix, mp)
prefix, typ = '_card_b_prefix', 'cardb' prefix, typ = '_card_b_prefix', 'cardb'
def open(self): def open(self):
time.sleep(5) time.sleep(5)
self._main_prefix = self._card_a_prefix = self._card_b_prefix = None self._main_prefix = self._card_a_prefix = self._card_b_prefix = None