Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-02-05 21:05:17 +01:00
Code Issues Projects Releases Wiki Activity

Merge from trunk

Browse source
This commit is contained in:
Charles Haley 2010-10-01 18:46:18 +01:00
commit 4dc9bb212f
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/calibre/devices/hanvon/driver.py
View file

@ -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)

2
src/calibre/library/restore.py
View file

@ -39,7 +39,7 @@ def __init__(self, library_path, progress_callback=None):
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 = []