Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge from trunk

Browse Source
This commit is contained in:
Charles Haley 2010-10-01 18:31:40 +01:00
commit eb74959f62
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/library/check_library.py
View File

@ -12,7 +12,6 @@ from calibre.constants import filesystem_encoding
from calibre.ebooks import BOOK_EXTENSIONS from calibre.ebooks import BOOK_EXTENSIONS
EBOOK_EXTENSIONS = frozenset(BOOK_EXTENSIONS) EBOOK_EXTENSIONS = frozenset(BOOK_EXTENSIONS)
NORMALS = frozenset(['metadata.opf', 'cover.jpg']) NORMALS = frozenset(['metadata.opf', 'cover.jpg'])
CHECKS = [('invalid_titles', _('Invalid titles')), CHECKS = [('invalid_titles', _('Invalid titles')),
@ -42,7 +41,7 @@ class CheckLibrary(object):
self.all_lc_dbpaths = frozenset([f.lower() for f in self.all_dbpaths]) self.all_lc_dbpaths = frozenset([f.lower() for f in self.all_dbpaths])
self.db_id_regexp = re.compile(r'^.* \((\d+)\)$') 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]+')
self.dirs = [] self.dirs = []
self.book_dirs = [] self.book_dirs = []
@ -131,8 +130,9 @@ class CheckLibrary(object):
if not ext: if not ext:
return False return False
ext = ext[1:].lower() ext = ext[1:].lower()
if ext not in EBOOK_EXTENSIONS or \ if ext in EBOOK_EXTENSIONS:
self.bad_ext_pat.search(ext) is not None: return True
if self.bad_ext_pat.search(ext) is not None:
return False return False
return True return True