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

Fix regression that broke device detection for Cybook devices in 0.6.28 on windows and linux

Browse Source
This commit is contained in:
Kovid Goyal 2009-12-15 08:50:57 -07:00
parent b632639ff7
commit 3345f311dd
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,9 +82,8 @@ class CYBOOKG3(USBMS):
def can_handle(cls, device_info, debug=False): def can_handle(cls, device_info, debug=False):
USBMS.can_handle(device_info, debug) USBMS.can_handle(device_info, debug)
if islinux: if islinux:
if device_info[3] == 'Bookeen' and device_info[4] == 'Cybook Gen3': return device_info[3] == 'Bookeen' and device_info[4] == 'Cybook Gen3'
return True return True
return False
class CYBOOK_OPUS(CYBOOKG3): class CYBOOK_OPUS(CYBOOKG3):
@ -92,7 +91,7 @@ class CYBOOK_OPUS(CYBOOKG3):
name = 'Cybook Opus Device Interface' name = 'Cybook Opus Device Interface'
gui_name = 'Cybook Opus' gui_name = 'Cybook Opus'
description = _('Communicate with the Cybook Opus eBook reader.') description = _('Communicate with the Cybook Opus eBook reader.')
author = _('John Schember') author = 'John Schember'
supported_platforms = ['windows', 'osx', 'linux'] supported_platforms = ['windows', 'osx', 'linux']
FORMATS = ['epub', 'pdf', 'txt'] FORMATS = ['epub', 'pdf', 'txt']
@ -116,6 +115,5 @@ class CYBOOK_OPUS(CYBOOKG3):
def can_handle(cls, device_info, debug=False): def can_handle(cls, device_info, debug=False):
USBMS.can_handle(device_info, debug) USBMS.can_handle(device_info, debug)
if islinux: if islinux:
if device_info[3] == 'Bookeen': return device_info[3] == 'Bookeen'
return True return True
return False