From 12374868318c6b39971ce4c6c54310f4ffc6e03a Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Wed, 19 May 2010 09:41:09 +0100
Subject: [PATCH] Fix prefix to be normalized. Apparently the python file
 dialog returns front-slashed filenames, even on windows.

---
 src/calibre/devices/folder_device/driver.py | 1 +
 src/calibre/devices/usbms/driver.py         | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/folder_device/driver.py b/src/calibre/devices/folder_device/driver.py
index 792de9ee0a..bb3c684099 100644
--- a/src/calibre/devices/folder_device/driver.py
+++ b/src/calibre/devices/folder_device/driver.py
@@ -54,6 +54,7 @@ class FOLDER_DEVICE(USBMS):
     def __init__(self, path):
         if not os.path.isdir(path):
             raise IOError, 'Path is not a folder'
+        path = USBMS.normalize_path(path)
         if path.endswith(os.sep):
             self._main_prefix = path
         else:
diff --git a/src/calibre/devices/usbms/driver.py b/src/calibre/devices/usbms/driver.py
index 5273ffe579..f519e8ce22 100644
--- a/src/calibre/devices/usbms/driver.py
+++ b/src/calibre/devices/usbms/driver.py
@@ -90,7 +90,6 @@ class USBMS(CLI, Device):
                             #print 'update_metadata_item returned true'
                             changed = True
                     else:
-                        #print "adding new book", lpath
                         if bl.add_book(self.book_from_path(prefix, lpath),
                                               replace_metadata=False):
                             changed = True