...

src/calibre/devices/__init__.py

@@ -159,7 +159,6 @@ def debug(ioreg_to_tmp=False, buf=None):
 def device_info(ioreg_to_tmp=False, buf=None):
     from calibre.devices.scanner import DeviceScanner, win_pnp_drives
     from calibre.constants import iswindows
-    from calibre import prints
     import re
 
     res = {}
@@ -182,14 +181,12 @@ def device_info(ioreg_to_tmp=False, buf=None):
                     if rev:
                         rev = rev.group(1)
                         d = vid+pid+rev
-                        prints(d)
                         device_set.add(d)
                         device_details[d] = (vid, pid, rev)
         res['device_set'] = device_set
         res['device_details'] = device_details
         drives = win_pnp_drives(debug=False)
         drive_details = {}
-        print drives
         drive_set = set()
         for drive,details in drives.iteritems():
             order = 'ORD_' + str(drive.order)
@@ -200,7 +197,6 @@ def device_info(ioreg_to_tmp=False, buf=None):
                 if prod:
                     prod = prod.group(1)
                     d = (order, ven, prod)
-                    print d
                     drive_details[drive] = d
                     drive_set.add(drive)
         res['drive_details'] = drive_details

src/calibre/devices/user_defined/driver.py

@@ -10,7 +10,7 @@ from calibre.ebooks import BOOK_EXTENSIONS
 class USER_DEFINED(USBMS):
 
     name           = 'User Defined USB driver'
-    gui_name       = 'User Defined phone'
+    gui_name       = 'User Defined USB Device'
     author         = 'Kovid Goyal'
     supported_platforms = ['windows', 'osx', 'linux']
 
@@ -66,21 +66,22 @@ class USER_DEFINED(USBMS):
     OPT_MAIN_MEM_FOLDER         = 7
     OPT_CARD_A_FOLDER           = 8
 
-    def __init__(self, *args):
+    def initialize(self):
-        USBMS.__init__(self, args)
         try:
             e = self.settings().extra_customization
             self.VENDOR_ID          = int(e[self.OPT_USB_VENDOR_ID], 16)
             self.PRODUCT_ID         = int(e[self.OPT_USB_PRODUCT_ID], 16)
             self.BCD                = [int(e[self.OPT_USB_REVISION_ID], 16)]
-            print '%x, %x, %s' %(self.VENDOR_ID, self.PRODUCT_ID, str(self.BCD))
             if e[self.OPT_USB_WINDOWS_MM_VEN_ID]:
                 self.VENDOR_NAME.append(e[self.OPT_USB_WINDOWS_MM_VEN_ID])
-            if e[self.OPT_USB_WINDOWS_CA_VEN_ID]:
+            if e[self.OPT_USB_WINDOWS_CA_VEN_ID] and \
+                    e[self.OPT_USB_WINDOWS_CA_VEN_ID] not in self.VENDOR_NAME:
                 self.VENDOR_NAME.append(e[self.OPT_USB_WINDOWS_CA_VEN_ID])
-            self.WINDOWS_MAIN_MEM   = e[self.OPT_USB_WINDOWS_MM_ID]
+            self.WINDOWS_MAIN_MEM   = e[self.OPT_USB_WINDOWS_MM_ID] + '&'
-            self.WINDOWS_CARD_A_MEM = e[self.OPT_USB_WINDOWS_CA_ID]
+            self.WINDOWS_CARD_A_MEM = e[self.OPT_USB_WINDOWS_CA_ID] + '&'
             self.EBOOK_DIR_MAIN     = e[self.OPT_MAIN_MEM_FOLDER]
             self.EBOOK_DIR_CARD_A   = e[self.OPT_CARD_A_FOLDER]
         except:
-            pass
+            import traceback
+            traceback.print_exc()
+        USBMS.initialize(self)

src/calibre/gui2/preferences/device_user_defined.py

@@ -81,7 +81,12 @@ class UserDefinedDevice(QDialog):
                         res += _('Windows card A ID string') + ': ' + \
                                 after['drive_details'][d][2] + '\n'
 
-            self.log.setPlainText(res)
+            trailer = _('Enter the above values into the USER_DEVICE by '
+                        'customizing the device plugin. Be sure to also '
+                        'enter the folders where you want the books to '
+                        'be put. You must restart calibre for your changes '
+                        'to take effect.\n')
+            self.log.setPlainText(res + '\n\n' + trailer)
         finally:
             self.bbox.setEnabled(True)
 

src/calibre/gui2/preferences/misc.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 from calibre.gui2.preferences import ConfigWidgetBase, test_widget, Setting
 from calibre.gui2.preferences.misc_ui import Ui_Form
 from calibre.gui2 import error_dialog, config, open_local_file, info_dialog
-from calibre.constants import isosx
+from calibre.constants import isosx, iswindows
 
 class WorkersSetting(Setting):
 
@@ -33,6 +33,7 @@ class ConfigWidget(ConfigWidgetBase, Ui_Form):
         self.user_defined_device_button.clicked.connect(self.user_defined_device)
         self.button_osx_symlinks.clicked.connect(self.create_symlinks)
         self.button_osx_symlinks.setVisible(isosx)
+        self.user_defined_device_button.setVisible(iswindows)
 
     def debug_device_detection(self, *args):
         from calibre.gui2.preferences.device_debug import DebugDevice

src/calibre/gui2/preferences/misc.ui

@@ -61,7 +61,7 @@
    <item row="4" column="0" colspan="2">
     <widget class="QPushButton" name="user_defined_device_button">
      <property name="text">
-      <string>Setup the &amp;user defined device</string>
+      <string>Get information to setup the &amp;user defined device (Windows only)</string>
      </property>
     </widget>
    </item>