Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Normalize paths for folder_device.

Browse Source
This commit is contained in:
Charles Haley 2010-05-15 20:35:15 +01:00
parent 1a42f0aae7
commit 583f9c1197
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/devices/usbms/driver.py
View File

@ -174,11 +174,19 @@ class USBMS(CLI, Device):
blist = 2 if location[1] == 'cardb' else 1 if location[1] == 'carda' else 0 blist = 2 if location[1] == 'cardb' else 1 if location[1] == 'carda' else 0
if self._main_prefix: if self._main_prefix:
# Normalize path and prefix
if self._main_prefix.find('\\') >= 0:
path = path.replace('/', '\\')
else:
path = path.replace('\\', '/')
prefix = self._main_prefix if path.startswith(self._main_prefix) else None prefix = self._main_prefix if path.startswith(self._main_prefix) else None
if not prefix and self._card_a_prefix: if not prefix and self._card_a_prefix:
prefix = self._card_a_prefix if path.startswith(self._card_a_prefix) else None prefix = self._card_a_prefix if path.startswith(self._card_a_prefix) else None
if not prefix and self._card_b_prefix: if not prefix and self._card_b_prefix:
prefix = self._card_b_prefix if path.startswith(self._card_b_prefix) else None prefix = self._card_b_prefix if path.startswith(self._card_b_prefix) else None
if prefix is None:
print 'in add_books_to_metadata. Prefix is None!', path, self._main_prefix
continue
lpath = path.partition(prefix)[2] lpath = path.partition(prefix)[2]
if lpath.startswith(os.sep): if lpath.startswith(os.sep):
lpath = lpath[len(os.sep):] lpath = lpath[len(os.sep):]