From bcb2f0e58daddd4c0c769cad1547710d556f51a1 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 2 Dec 2009 02:25:31 +0000 Subject: [PATCH] Fix #4120 (Uploading multiple books by the same author nests the folders) --- src/calibre/devices/jetbook/driver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/jetbook/driver.py b/src/calibre/devices/jetbook/driver.py index 4ef9d88afb..40c5f31dda 100644 --- a/src/calibre/devices/jetbook/driver.py +++ b/src/calibre/devices/jetbook/driver.py @@ -53,7 +53,7 @@ class JETBOOK(USBMS): def upload_books(self, files, names, on_card=False, end_session=True, metadata=None): - path = self._sanity_check(on_card, files) + base_path = self._sanity_check(on_card, files) paths = [] names = iter(names) @@ -61,7 +61,7 @@ class JETBOOK(USBMS): for i, infile in enumerate(files): mdata, fname = metadata.next(), names.next() - path = os.path.dirname(self.create_upload_path(path, mdata, fname)) + path = os.path.dirname(self.create_upload_path(base_path, mdata, fname)) author = sanitize(mdata.get('authors','Unknown')).replace(' ', '_') title = sanitize(mdata.get('title', 'Unknown')).replace(' ', '_')