From 0cef7d8662d6a2f1e6471a965fa19e8755a2fa06 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Oct 2010 11:39:40 -0600 Subject: [PATCH 1/2] ... --- src/calibre/library/restore.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/library/restore.py b/src/calibre/library/restore.py index c81cf7abcb..ab4e59a4c3 100644 --- a/src/calibre/library/restore.py +++ b/src/calibre/library/restore.py @@ -39,7 +39,7 @@ class Restore(Thread): self.src_library_path = os.path.abspath(library_path) self.progress_callback = progress_callback self.db_id_regexp = re.compile(r'^.* \((\d+)\)$') - self.bad_ext_pat = re.compile(r'[^a-z]+') + self.bad_ext_pat = re.compile(r'[^a-z0-9]+') if not callable(self.progress_callback): self.progress_callback = lambda x, y: x self.dirs = [] From a14118eb39bc7e25298bb8c428c61498eec0ebfd Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Oct 2010 11:42:13 -0600 Subject: [PATCH 2/2] Alex driver: Do not put files into subdirectories. Also add fb2 to list of supported formats --- src/calibre/devices/hanvon/driver.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/hanvon/driver.py b/src/calibre/devices/hanvon/driver.py index 6291864b86..bea65b0e50 100644 --- a/src/calibre/devices/hanvon/driver.py +++ b/src/calibre/devices/hanvon/driver.py @@ -59,14 +59,14 @@ class ALEX(N516): description = _('Communicate with the SpringDesign Alex eBook reader.') author = 'Kovid Goyal' - FORMATS = ['epub', 'pdf'] + FORMATS = ['epub', 'fb2', 'pdf'] VENDOR_NAME = 'ALEX' WINDOWS_MAIN_MEM = 'READER' MAIN_MEMORY_VOLUME_LABEL = 'Alex Internal Memory' EBOOK_DIR_MAIN = 'eBooks' - SUPPORTS_SUB_DIRS = True + SUPPORTS_SUB_DIRS = False def can_handle(self, device_info, debug=False): return is_alex(device_info)