Fix #4120 (Uploading multiple books by the same author nests the folders)

This commit is contained in:
Kovid Goyal 2009-12-02 02:25:31 +00:00
parent 7cefca28fe
commit bcb2f0e58d

View File

@ -53,7 +53,7 @@ class JETBOOK(USBMS):
def upload_books(self, files, names, on_card=False, end_session=True, def upload_books(self, files, names, on_card=False, end_session=True,
metadata=None): metadata=None):
path = self._sanity_check(on_card, files) base_path = self._sanity_check(on_card, files)
paths = [] paths = []
names = iter(names) names = iter(names)
@ -61,7 +61,7 @@ class JETBOOK(USBMS):
for i, infile in enumerate(files): for i, infile in enumerate(files):
mdata, fname = metadata.next(), names.next() 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(' ', '_') author = sanitize(mdata.get('authors','Unknown')).replace(' ', '_')
title = sanitize(mdata.get('title', 'Unknown')).replace(' ', '_') title = sanitize(mdata.get('title', 'Unknown')).replace(' ', '_')