Remove illegal characters from filepath when uploading to device.

src/calibre/devices/cybookg3/driver.py

@@ -68,10 +68,11 @@ class CYBOOKG3(USBMS):
                 newpath = os.path.join(newpath, mdata.get('authors', _('Unknown')))
                 newpath = os.path.join(newpath, mdata.get('title', _('Unknown')))
 
+            newpath = self._sanitize_path(newpath)
             if not os.path.exists(newpath):
                 os.makedirs(newpath)
 
-            filepath = os.path.join(newpath, names.next())
+            filepath = self._sanitize_path(os.path.join(newpath, names.next()))
             paths.append(filepath)
 
             if hasattr(infile, 'read'):

src/calibre/devices/jetbook/driver.py

@@ -78,10 +78,11 @@ class JETBOOK(USBMS):
             if newpath == path:
                 newpath = os.path.join(newpath, author, title)
 
+            newpath = self._sanitize_path(newpath)
             if not os.path.exists(newpath):
                 os.makedirs(newpath)
 
-            filepath = os.path.join(newpath, fname)
+            filepath = self._sanitize_path(os.path.join(newpath, fname))
             paths.append(filepath)
 
             if hasattr(infile, 'read'):

src/calibre/devices/prs505/driver.py

@@ -4,7 +4,9 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net> ' \
 '''
 Device driver for the SONY PRS-505
 '''
-import os, time
+import os
+import re
+import time
 from itertools import cycle
 
 from calibre.devices.usbms.cli import CLI
@@ -99,6 +101,11 @@ class PRS505(CLI, Device):
         self.report_progress(1.0, _('Getting list of books on device...'))
         return bl
 
+    def _sanitize_path(self, path):
+        path = re.sub('[?<>:*|\^]+', '', path)
+        path = re.sub('[\.\s]+$', '', path)
+        return path
+
     def upload_books(self, files, names, on_card=None, end_session=True,
                      metadata=None):
         if on_card == 'carda' and not self._card_a_prefix:
@@ -162,10 +169,11 @@ class PRS505(CLI, Device):
                 newpath = os.path.join(newpath, mdata.get('authors', _('Unknown')))
                 newpath = os.path.join(newpath, mdata.get('title', _('Unknown')))
 
+            newpath = self._sanitize_path(newpath)
             if not os.path.exists(newpath):
                 os.makedirs(newpath)
 
-            filepath = os.path.join(newpath, names.next())
+            filepath = self._sanitize_path(os.path.join(newpath, names.next()))
             paths.append(filepath)
 
             self.put_file(infile, paths[-1], replace_file=True)

src/calibre/devices/usbms/driver.py

@@ -7,7 +7,10 @@ driver. It is intended to be subclassed with the relevant parts implemented
 for a particular device.
 '''
 
-import os, fnmatch, shutil
+import os
+import fnmatch
+import shutil
+import re
 from itertools import cycle
 
 from calibre.ebooks.metadata import authors_to_string
@@ -113,6 +116,11 @@ class USBMS(CLI, Device):
             raise FreeSpaceError(_("There is insufficient free space on the storage card"))
         return path
 
+    def _sanitize_path(self, path):
+        path = re.sub('[?<>:*|\^]+', '', path)
+        path = re.sub('[\.\s]+$', '', path)
+        return path
+
     def upload_books(self, files, names, on_card=None, end_session=True,
                      metadata=None):
 
@@ -145,10 +153,11 @@ class USBMS(CLI, Device):
                         mdata.get('authors', _('Unknown')),
                         mdata.get('title', _('Unknown')))
 
+            newpath = self._sanitize_path(newpath)
             if not os.path.exists(newpath):
                 os.makedirs(newpath)
 
-            filepath = os.path.join(newpath, names.next())
+            filepath = self._sanitize_path(os.path.join(newpath, names.next()))
             paths.append(filepath)
 
             if hasattr(infile, 'read'):