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

Refactor the device driver system to support devices from manufacturers that don't bother to assign unique ids to their devices. Preliminary drivers for CyBook Opus (windows/os x) and Cool-er (windows only)

Browse Source
This commit is contained in:
Kovid Goyal 2009-07-31 16:56:37 -06:00
parent 34c75d7aea
commit ab71d9f4cd
7 changed files with 104 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/customize/builtins.py
View File

@ -354,8 +354,8 @@ from calibre.customize.profiles import input_profiles, output_profiles
from calibre.devices.bebook.driver import BEBOOK, BEBOOK_MINI
from calibre.devices.blackberry.driver import BLACKBERRY
from calibre.devices.cybookg3.driver import CYBOOKG3
from calibre.devices.eb600.driver import EB600
from calibre.devices.cybookg3.driver import CYBOOKG3, CYBOOK_OPUS
from calibre.devices.eb600.driver import EB600, COOL_ER
from calibre.devices.iliad.driver import ILIAD
from calibre.devices.irexdr.driver import IREXDR1000
from calibre.devices.jetbook.driver import JETBOOK
@ -412,6 +412,8 @@ plugins += [
PRS505,
PRS700,
ANDROID,
CYBOOK_OPUS,
COOL_ER
]
plugins += [x for x in list(locals().values()) if isinstance(x, type) and \
x.__name__.endswith('MetadataReader')]

31
src/calibre/debug.py
View File

@ -114,16 +114,37 @@ def debug_device_driver():
raw = Device.run_ioreg()
open('/tmp/ioreg.txt', 'wb').write(raw)
print 'ioreg output saved to /tmp/ioreg.txt'
connected_devices = []
for dev in device_plugins():
print 'Looking for', dev.__class__.__name__
connected = s.is_device_connected(dev)
if connected:
print 'Device Connected:', dev
print 'Trying to open device...'
connected_devices.append(dev)
errors = {}
success = False
for dev in connected_devices:
print 'Device possibly connected:', dev
print 'Trying to open device...',
try:
dev.open()
print 'Main memory:', repr(dev._main_prefix)
print 'Total space:', dev.total_space()
break
print 'OK'
except:
import traceback
errors[dev] = traceback.format_exc()
print 'failed'
continue
success = True
print 'Main memory:', repr(dev._main_prefix)
print 'Total space:', dev.total_space()
break
if not success and errors:
print 'Opening of the following devices failed'
for dev,msg in errors.items():
print dev
print msg
print
def add_simple_plugin(path_to_plugin):
import tempfile, zipfile, shutil

20
src/calibre/devices/cybookg3/driver.py
View File

@ -124,3 +124,23 @@ class CYBOOKG3(USBMS):
except:
pass
self.report_progress(1.0, _('Removing books from device...'))
class CYBOOK_OPUS(CYBOOKG3):
FORMATS = ['epub', 'pdf', 'txt']
VENDOR_ID = [0x0bda]
PRODUCT_ID = [0x0703]
BCD = [0x110]
WINDOWS_MAIN_MEM = 'CYBOOK_OPUS__-FD'
WINDOWS_CARD_A_MEM = 'CYBOOK_OPUS__-SD'
OSX_MAIN_MEM = 'Bookeen Cybook Opus -FD Media'
OSX_CARD_A_MEM = 'Bookeen Cybook Opus -SD Media'
def upload_books(self, *args, **kwargs):
USBMS.upload_books(self, *args, **kwargs)
def delete_books(self, *args, **kwargs):
USBMS.delete_books(self, *args, **kwargs)

11
src/calibre/devices/eb600/driver.py
View File

@ -20,7 +20,7 @@ class EB600(USBMS):
supported_platforms = ['windows', 'osx', 'linux']
# Ordered list of supported formats
FORMATS = ['epub', 'prc', 'chm', 'djvu', 'html', 'rtf', 'txt', 'pdf']
FORMATS = ['epub', 'mobi', 'prc', 'chm', 'djvu', 'html', 'rtf', 'txt', 'pdf']
DRM_FORMATS = ['prc', 'mobi', 'html', 'pdf', 'txt']
VENDOR_ID = [0x1f85]
@ -51,3 +51,12 @@ class EB600(USBMS):
return drives
class COOL_ER(EB600):
FORMATS = ['epub', 'mobi', 'prc', 'pdf', 'txt']
VENDOR_NAME = 'COOL-ER'
WINDOWS_MAIN_MEM = 'EREADER'
EBOOK_DIR_MAIN = 'my docs'

12
src/calibre/devices/prs500/cli/main.py
View File

@ -204,15 +204,27 @@ def main():
_wmi = wmi.WMI()
scanner = DeviceScanner(_wmi)
scanner.scan()
connected_devices = []
for d in device_plugins():
if scanner.is_device_connected(d):
dev = d
dev.reset(log_packets=options.log_packets)
connected_devices.append(dev)
if dev is None:
print >>sys.stderr, 'Unable to find a connected ebook reader.'
return 1
for d in connected_devices:
try:
d.open()
except:
continue
else:
dev = d
break
try:
dev.open()
if command == "df":

2
src/calibre/ebooks/metadata/txt.py
View File

@ -16,7 +16,7 @@ def get_metadata(stream, extract_cover=True):
mdata = u''
for x in range(0, 4):
line = stream.readline().decode('utf-8')
line = stream.readline().decode('utf-8', 'replace')
if line == '':
break
else:

52
src/calibre/gui2/device.py
View File

@ -89,33 +89,39 @@ class DeviceManager(Thread):
self.current_job = None
self.scanner = DeviceScanner()
def do_connect(self, connected_devices):
if iswindows:
import pythoncom
pythoncom.CoInitialize()
try:
for dev in connected_devices:
dev.reset()
try:
dev.open()
except:
print 'Unable to open device', dev
traceback.print_exc()
continue
self.device = dev
self.device_class = dev.__class__
self.connected_slot(True)
break
finally:
if iswindows:
pythoncom.CoUninitialize()
def detect_device(self):
self.scanner.scan()
connected_devices = []
for device in self.devices:
connected = self.scanner.is_device_connected(device[0])
if connected and not device[1]:
if device[2]:
continue
try:
dev = device[0]
dev.reset()
if iswindows:
import pythoncom
pythoncom.CoInitialize()
try:
dev.open()
finally:
if iswindows:
pythoncom.CoUninitialize()
self.device = dev
self.device_class = dev.__class__
self.connected_slot(True)
except:
print 'Unable to open device'
traceback.print_exc()
finally:
device[1] = True
if connected and not device[1] and not device[2]:
# If connected and not showing in GUI and not ejected
connected_devices.append(device[0])
device[1] = True
elif not connected and device[1]:
# Disconnected but showing in GUI
while True:
try:
job = self.jobs.get_nowait()
@ -126,6 +132,8 @@ class DeviceManager(Thread):
self.device = None
self.connected_slot(False)
device[1] ^= True
if connected_devices:
self.do_connect(connected_devices)
def umount_device(self):
if self.device is not None: