From 612ea061c4896a43483b3e1f03a99f2fc489e8d9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 13 Jun 2011 21:02:57 -0600 Subject: [PATCH] Fix NC driver to use same logic as Nook TSR driver --- src/calibre/devices/nook/driver.py | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py index 240f458af8..67c543a763 100644 --- a/src/calibre/devices/nook/driver.py +++ b/src/calibre/devices/nook/driver.py @@ -90,30 +90,21 @@ class NOOK_COLOR(NOOK): EBOOK_DIR_MAIN = 'My Files' - def create_upload_path(self, path, mdata, fname, create_dirs=True): - filepath = NOOK.create_upload_path(self, path, mdata, fname, - create_dirs=False) - edm = self.EBOOK_DIR_MAIN - subdir = 'Books' - if mdata.tags: - if _('News') in mdata.tags: - subdir = 'Magazines' - filepath = filepath.replace(os.sep+edm+os.sep, - os.sep+edm+os.sep+subdir+os.sep) - filedir = os.path.dirname(filepath) - if create_dirs and not os.path.exists(filedir): - os.makedirs(filedir) - - return filepath - def upload_cover(self, path, filename, metadata, filepath): pass def get_carda_ebook_dir(self, for_upload=False): if for_upload: - return 'My Files/Books' + return self.EBOOK_DIR_MAIN return '' + def create_upload_path(self, path, mdata, fname, create_dirs=True): + is_news = mdata.tags and _('News') in mdata.tags + subdir = 'Magazines' if is_news else 'Books' + path = os.path.join(path, subdir) + return NOOK.create_upload_path(self, path, mdata, fname, + create_dirs=create_dirs) + class NOOK_TSR(NOOK): gui_name = _('Nook Simple') description = _('Communicate with the Nook TSR eBook reader.')