From 01da2517fc027b1e2c912e49de6a3dce03e6ef5a Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 26 Dec 2009 12:46:43 -0700
Subject: [PATCH] Device drivers: Always print out device ids in debug mode.
 Also get manufacturer, product ans serial number strings on OS X

---
 src/calibre/devices/cybookg3/driver.py        |  2 --
 src/calibre/devices/interface.py              | 36 +++++++++++--------
 src/calibre/devices/scanner.py                |  6 ++++
 src/calibre/devices/usbobserver/usbobserver.c |  2 +-
 4 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
index 97280f1e30..96226fcfd6 100644
--- a/src/calibre/devices/cybookg3/driver.py
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -55,7 +55,6 @@ class CYBOOKG3(USBMS):
 
     @classmethod
     def can_handle(cls, device_info, debug=False):
-        USBMS.can_handle(device_info, debug)
         if islinux:
             return device_info[3] == 'Bookeen' and device_info[4] == 'Cybook Gen3'
         return True
@@ -88,7 +87,6 @@ class CYBOOK_OPUS(CYBOOKG3):
 
     @classmethod
     def can_handle(cls, device_info, debug=False):
-        USBMS.can_handle(device_info, debug)
         if islinux:
             return device_info[3] == 'Bookeen'
         return True
diff --git a/src/calibre/devices/interface.py b/src/calibre/devices/interface.py
index 21aa3f5e5b..3eb7a44853 100644
--- a/src/calibre/devices/interface.py
+++ b/src/calibre/devices/interface.py
@@ -55,7 +55,15 @@ class DevicePlugin(Plugin):
         return False
 
     @classmethod
-    def is_usb_connected_windows(cls, devices_on_system):
+    def print_usb_device_info(cls, info):
+        try:
+            print '\t', repr(info)
+        except:
+            import traceback
+            traceback.print_exc()
+
+    @classmethod
+    def is_usb_connected_windows(cls, devices_on_system, debug=False):
 
         def id_iterator():
             if hasattr(cls.VENDOR_ID, 'keys'):
@@ -75,9 +83,13 @@ class DevicePlugin(Plugin):
             vid, pid = 'vid_%4.4x'%vendor_id, 'pid_%4.4x'%product_id
             vidd, pidd = 'vid_%i'%vendor_id, 'pid_%i'%product_id
             for device_id in devices_on_system:
-                if (vid in device_id or vidd in device_id) and (pid in device_id or pidd in device_id):
-                    if cls.test_bcd_windows(device_id, bcd) and cls.can_handle(device_id):
-                        return True
+                if (vid in device_id or vidd in device_id) and \
+                   (pid in device_id or pidd in device_id) and \
+                   cls.test_bcd_windows(device_id, bcd):
+                       if debug:
+                           cls.print_usb_device_info(device_id)
+                       if cls.can_handle(device_id):
+                           return True
         return False
 
     @classmethod
@@ -97,7 +109,7 @@ class DevicePlugin(Plugin):
         :param devices_on_system: List of devices currently connected
         '''
         if iswindows:
-            return cls.is_usb_connected_windows(devices_on_system)
+            return cls.is_usb_connected_windows(devices_on_system, debug=debug)
 
         vendors_on_system = set([x[0] for x in devices_on_system])
         vendors = cls.VENDOR_ID if hasattr(cls.VENDOR_ID, '__len__') else [cls.VENDOR_ID]
@@ -118,9 +130,11 @@ class DevicePlugin(Plugin):
                                 cbcd = cls.VENDOR_ID[vid][pid]
                             else:
                                 cbcd = cls.BCD
-                            if cls.test_bcd(bcd, cbcd) and cls.can_handle(dev,
-                                                            debug=debug):
-                                return True
+                            if cls.test_bcd(bcd, cbcd):
+                                if debug:
+                                    cls.print_usb_device_info(dev)
+                                if cls.can_handle(dev, debug=debug):
+                                    return True
         return False
 
 
@@ -152,12 +166,6 @@ class DevicePlugin(Plugin):
         :param device_info: On windows a device ID string. On Unix a tuple of
         ``(vendor_id, product_id, bcd)``.
         '''
-        try:
-            if debug:
-                print '\t', repr(device_info)
-        except:
-            import traceback
-            traceback.print_exc()
         return True
 
     def open(self):
diff --git a/src/calibre/devices/scanner.py b/src/calibre/devices/scanner.py
index f69ccb9107..ef83659fe3 100644
--- a/src/calibre/devices/scanner.py
+++ b/src/calibre/devices/scanner.py
@@ -40,6 +40,7 @@ class LinuxScanner(object):
             prod = os.path.join(base, 'idProduct')
             bcd = os.path.join(base, 'bcdDevice')
             man = os.path.join(base, 'manufacturer')
+            serial = os.path.join(base, 'serial')
             prod_string = os.path.join(base, 'product')
             dev = []
             try:
@@ -62,6 +63,11 @@ class LinuxScanner(object):
                 dev.append(open(prod_string).read().strip())
             except:
                 dev.append('')
+            try:
+                dev.append(open(serial).read().strip())
+            except:
+                dev.append('')
+
             ans.add(tuple(dev))
         return ans
 
diff --git a/src/calibre/devices/usbobserver/usbobserver.c b/src/calibre/devices/usbobserver/usbobserver.c
index ad30ad6e53..eb98f13892 100644
--- a/src/calibre/devices/usbobserver/usbobserver.c
+++ b/src/calibre/devices/usbobserver/usbobserver.c
@@ -99,7 +99,7 @@ usbobserver_get_usb_devices(PyObject *self, PyObject *args) {
     serial = get_iokit_string_property(usbDevice, 2);
     if (serial == NULL) serial = Py_None;
 
-    device = Py_BuildValue("(iiiOOO)", vendor, product, bcd, manufacturer, productn, serial);
+    device = Py_BuildValue("(iiiNNN)", vendor, product, bcd, manufacturer, productn, serial);
     if (device == NULL) {
       IOObjectRelease(usbDevice);
       (*plugInInterface)->Release(plugInInterface);