From 05a15302ae43efc3109d18e5a09260e8e3d64bb1 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Thu, 7 Jan 2010 19:07:55 -0500
Subject: [PATCH] Slight detection changes for Cybooks.

---
 src/calibre/customize/builtins.py      | 1 +
 src/calibre/devices/cybookg3/driver.py | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index e2291aa427..9f06993eb3 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -455,6 +455,7 @@ plugins += [
     TCROutput,
     TXTOutput,
 ]
+# Order here matters. The first matched device is the one used.
 plugins += [
     HANLINV3,
     HANLINV5,
diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
index c09f795627..439423dbe5 100644
--- a/src/calibre/devices/cybookg3/driver.py
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -70,8 +70,6 @@ class CYBOOK_OPUS(CYBOOKG3):
     author         = 'John Schember'
     supported_platforms = ['windows', 'osx', 'linux']
 
-    FORMATS = ['epub', 'pdf', 'txt']
-
     VENDOR_ID   = [0x0bda]
     PRODUCT_ID  = [0x0703]
     BCD         = [0x110]
@@ -90,5 +88,5 @@ class CYBOOK_OPUS(CYBOOKG3):
     @classmethod
     def can_handle(cls, device_info, debug=False):
         if isunix:
-            return device_info[3] == 'Bookeen'
+            return device_info[3] == 'Bookeen' and device_info[4] == 'Cybook Opus'
         return True