From 0b4e09180dfd8d443a7fa1a9ebbae4806ca834c2 Mon Sep 17 00:00:00 2001 From: Charles Haley <> Date: Thu, 8 Jul 2010 18:30:19 +0100 Subject: [PATCH] Revert boox driver --- src/calibre/devices/hanlin/driver.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/calibre/devices/hanlin/driver.py b/src/calibre/devices/hanlin/driver.py index 3db55d05c5..f19135a7e7 100644 --- a/src/calibre/devices/hanlin/driver.py +++ b/src/calibre/devices/hanlin/driver.py @@ -119,25 +119,22 @@ class BOOX(HANLINV3): MAIN_MEMORY_VOLUME_LABEL = 'BOOX Internal Memory' STORAGE_CARD_VOLUME_LABEL = 'BOOX Storage Card' - EBOOK_DIR_MAIN = ['MyBooks', 'MyBooks'] - EXTRA_CUSTOMIZATION_MESSAGE = _('Directories to send e-books to on the device. ' - 'The first directory is used for main memory. ' - 'The second is used for cards.') + EBOOK_DIR_MAIN = ['MyBooks'] + EXTRA_CUSTOMIZATION_MESSAGE = _('Comma separated list of directories to ' + 'send e-books to on the device. The first one that exists will ' + 'be used.') EXTRA_CUSTOMIZATION_DEFAULT = ', '.join(EBOOK_DIR_MAIN) + # EBOOK_DIR_CARD_A = 'MyBooks' ## Am quite sure we need this. + def post_open_callback(self): opts = self.settings() dirs = opts.extra_customization if not dirs: dirs = self.EBOOK_DIR_MAIN else: - # will have at least one item ... dirs = [x.strip() for x in dirs.split(',')] - self.EBOOK_DIR_MAIN = dirs[0] - if len(dirs) > 1: - self.EBOOK_DIR_CARD_A = self.EBOOK_DIR_CARD_B = dirs[1] - else: - self.EBOOK_DIR_CARD_A = self.EBOOK_DIR_CARD_B = dirs[0] + self.EBOOK_DIR_MAIN = dirs def windows_sort_drives(self, drives): return drives