mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Add check for valid has_cover to check_library
This commit is contained in:
Charles Haley
parent
f50f3793db
commit
2145a487d4
@ -32,23 +32,30 @@ class CheckLibraryDialog(QDialog):
|
||||
self.log.itemChanged.connect(self.item_changed)
|
||||
self._layout.addWidget(self.log)
|
||||
|
||||
self.check = QPushButton(_('&Run the check'))
|
||||
self.check.setDefault(False)
|
||||
self.check.clicked.connect(self.run_the_check)
|
||||
self.copy = QPushButton(_('Copy &to clipboard'))
|
||||
self.copy.setDefault(False)
|
||||
self.copy.clicked.connect(self.copy_to_clipboard)
|
||||
self.ok = QPushButton('&Done')
|
||||
self.ok.setDefault(True)
|
||||
self.ok.clicked.connect(self.accept)
|
||||
self.delete = QPushButton('Delete &marked')
|
||||
self.delete.setDefault(False)
|
||||
self.delete.clicked.connect(self.delete_marked)
|
||||
self.check_button = QPushButton(_('&Run the check'))
|
||||
self.check_button.setDefault(False)
|
||||
self.check_button.clicked.connect(self.run_the_check)
|
||||
self.copy_button = QPushButton(_('Copy &to clipboard'))
|
||||
self.copy_button.setDefault(False)
|
||||
self.copy_button.clicked.connect(self.copy_to_clipboard)
|
||||
self.ok_button = QPushButton('&Done')
|
||||
self.ok_button.setDefault(True)
|
||||
self.ok_button.clicked.connect(self.accept)
|
||||
self.delete_button = QPushButton('Delete &marked')
|
||||
self.delete_button.setToolTip(_('Delete marked files (checked subitems)'))
|
||||
self.delete_button.setDefault(False)
|
||||
self.delete_button.clicked.connect(self.delete_marked)
|
||||
self.fix_button = QPushButton('&Fix marked')
|
||||
self.fix_button.setDefault(False)
|
||||
self.fix_button.setEnabled(False)
|
||||
self.fix_button.setToolTip(_('Fix marked sections (checked fixable items)'))
|
||||
self.fix_button.clicked.connect(self.fix_items)
|
||||
self.bbox = QDialogButtonBox(self)
|
||||
self.bbox.addButton(self.check, QDialogButtonBox.ActionRole)
|
||||
self.bbox.addButton(self.delete, QDialogButtonBox.ActionRole)
|
||||
self.bbox.addButton(self.copy, QDialogButtonBox.ActionRole)
|
||||
self.bbox.addButton(self.ok, QDialogButtonBox.AcceptRole)
|
||||
self.bbox.addButton(self.check_button, QDialogButtonBox.ActionRole)
|
||||
self.bbox.addButton(self.delete_button, QDialogButtonBox.ActionRole)
|
||||
self.bbox.addButton(self.fix_button, QDialogButtonBox.ActionRole)
|
||||
self.bbox.addButton(self.copy_button, QDialogButtonBox.ActionRole)
|
||||
self.bbox.addButton(self.ok_button, QDialogButtonBox.AcceptRole)
|
||||
|
||||
h = QHBoxLayout()
|
||||
ln = QLabel(_('Names to ignore:'))
|
||||
@ -93,12 +100,19 @@ class CheckLibraryDialog(QDialog):
|
||||
plaintext = []
|
||||
|
||||
def builder(tree, checker, check):
|
||||
attr, h, checkable = check
|
||||
attr, h, checkable, fixable = check
|
||||
list = getattr(checker, attr, None)
|
||||
if list is None:
|
||||
return
|
||||
|
||||
tl = Item([h])
|
||||
tl = Item()
|
||||
tl.setText(0, h)
|
||||
if fixable:
|
||||
tl.setText(1, _('(fixable)'))
|
||||
tl.setFlags(Qt.ItemIsEnabled | Qt.ItemIsUserCheckable)
|
||||
tl.setCheckState(1, False)
|
||||
self.top_level_items[attr] = tl
|
||||
|
||||
for problem in list:
|
||||
it = Item()
|
||||
if checkable:
|
||||
@ -107,6 +121,7 @@ class CheckLibraryDialog(QDialog):
|
||||
else:
|
||||
it.setFlags(Qt.ItemIsEnabled)
|
||||
it.setText(0, problem[0])
|
||||
it.setData(0, Qt.UserRole, problem[2])
|
||||
it.setText(1, problem[1])
|
||||
tl.addChild(it)
|
||||
self.all_items.append(it)
|
||||
@ -118,18 +133,25 @@ class CheckLibraryDialog(QDialog):
|
||||
t.setColumnCount(2);
|
||||
t.setHeaderLabels([_('Name'), _('Path from library')])
|
||||
self.all_items = []
|
||||
self.top_level_items = {}
|
||||
for check in CHECKS:
|
||||
builder(t, checker, check)
|
||||
|
||||
t.setColumnWidth(0, 200)
|
||||
t.setColumnWidth(1, 400)
|
||||
self.delete.setEnabled(False)
|
||||
self.delete_button.setEnabled(False)
|
||||
self.text_results = '\n'.join(plaintext)
|
||||
|
||||
def item_changed(self, item, column):
|
||||
self.fix_button.setEnabled(False)
|
||||
for it in self.top_level_items.values():
|
||||
if it.checkState(1):
|
||||
self.fix_button.setEnabled(True)
|
||||
|
||||
self.delete_button.setEnabled(False)
|
||||
for it in self.all_items:
|
||||
if it.checkState(1):
|
||||
self.delete.setEnabled(True)
|
||||
self.delete_button.setEnabled(True)
|
||||
return
|
||||
|
||||
def delete_marked(self):
|
||||
@ -157,6 +179,33 @@ class CheckLibraryDialog(QDialog):
|
||||
unicode(it.text(1))))
|
||||
self.run_the_check()
|
||||
|
||||
def fix_missing_covers(self):
|
||||
tl = self.top_level_items['missing_covers']
|
||||
child_count = tl.childCount()
|
||||
for i in range(0, child_count):
|
||||
item = tl.child(i);
|
||||
id = item.data(0, Qt.UserRole).toInt()[0]
|
||||
self.db.set_has_cover(id, False)
|
||||
|
||||
def fix_extra_covers(self):
|
||||
tl = self.top_level_items['extra_covers']
|
||||
child_count = tl.childCount()
|
||||
for i in range(0, child_count):
|
||||
item = tl.child(i);
|
||||
id = item.data(0, Qt.UserRole).toInt()[0]
|
||||
self.db.set_has_cover(id, True)
|
||||
|
||||
def fix_items(self):
|
||||
for check in CHECKS:
|
||||
attr = check[0]
|
||||
fixable = check[3]
|
||||
tl = self.top_level_items[attr]
|
||||
if fixable and tl.checkState(1):
|
||||
func = getattr(self, 'fix_' + attr, None)
|
||||
if func is not None and callable(func):
|
||||
func()
|
||||
self.run_the_check()
|
||||
|
||||
def copy_to_clipboard(self):
|
||||
QApplication.clipboard().setText(self.text_results)
|
||||
|
||||
|
||||
@ -14,14 +14,25 @@ from calibre.ebooks import BOOK_EXTENSIONS
|
||||
EBOOK_EXTENSIONS = frozenset(BOOK_EXTENSIONS)
|
||||
NORMALS = frozenset(['metadata.opf', 'cover.jpg'])
|
||||
|
||||
CHECKS = [('invalid_titles', _('Invalid titles'), True),
|
||||
('extra_titles', _('Extra titles'), True),
|
||||
('invalid_authors', _('Invalid authors'), True),
|
||||
('extra_authors', _('Extra authors'), True),
|
||||
('missing_formats', _('Missing book formats'), False),
|
||||
('extra_formats', _('Extra book formats'), True),
|
||||
('extra_files', _('Unknown files in books'), True),
|
||||
('failed_folders', _('Folders raising exception'), False)
|
||||
'''
|
||||
Checks fields:
|
||||
- name of array containing info
|
||||
- user-readable name of info
|
||||
- can be deleted (can be checked)
|
||||
- can be fixed. In this case, the name of the fix method is derived from the
|
||||
array name
|
||||
'''
|
||||
|
||||
CHECKS = [('invalid_titles', _('Invalid titles'), True, False),
|
||||
('extra_titles', _('Extra titles'), True, False),
|
||||
('invalid_authors', _('Invalid authors'), True, False),
|
||||
('extra_authors', _('Extra authors'), True, False),
|
||||
('missing_formats', _('Missing book formats'), False, False),
|
||||
('extra_formats', _('Extra book formats'), True, False),
|
||||
('extra_files', _('Unknown files in books'), True, False),
|
||||
('missing_covers', _('Missing covers in books'), False, True),
|
||||
('extra_covers', _('Extra covers in books'), True, True),
|
||||
('failed_folders', _('Folders raising exception'), False, False)
|
||||
]
|
||||
|
||||
|
||||
@ -57,6 +68,10 @@ class CheckLibrary(object):
|
||||
self.extra_formats = []
|
||||
self.extra_files = []
|
||||
|
||||
self.missing_covers = []
|
||||
self.extra_covers = []
|
||||
|
||||
self.failed_folders = []
|
||||
|
||||
def dbpath(self, id):
|
||||
return self.db.path(id, index_is_id=True)
|
||||
@ -83,7 +98,7 @@ class CheckLibrary(object):
|
||||
auth_path = os.path.join(lib, auth_dir)
|
||||
# First check: author must be a directory
|
||||
if not os.path.isdir(auth_path):
|
||||
self.invalid_authors.append((auth_dir, auth_dir))
|
||||
self.invalid_authors.append((auth_dir, auth_dir, 0))
|
||||
continue
|
||||
|
||||
self.potential_authors[auth_dir] = {}
|
||||
@ -98,7 +113,7 @@ class CheckLibrary(object):
|
||||
m = self.db_id_regexp.search(title_dir)
|
||||
# Second check: title must have an ID and must be a directory
|
||||
if m is None or not os.path.isdir(title_path):
|
||||
self.invalid_titles.append((auth_dir, db_path))
|
||||
self.invalid_titles.append((auth_dir, db_path, 0))
|
||||
continue
|
||||
|
||||
id = m.group(1)
|
||||
@ -106,12 +121,12 @@ class CheckLibrary(object):
|
||||
if self.is_case_sensitive:
|
||||
if int(id) not in self.all_ids or \
|
||||
db_path not in self.all_dbpaths:
|
||||
self.extra_titles.append((title_dir, db_path))
|
||||
self.extra_titles.append((title_dir, db_path, 0))
|
||||
continue
|
||||
else:
|
||||
if int(id) not in self.all_ids or \
|
||||
db_path.lower() not in self.all_lc_dbpaths:
|
||||
self.extra_titles.append((title_dir, db_path))
|
||||
self.extra_titles.append((title_dir, db_path, 0))
|
||||
continue
|
||||
|
||||
# Record the book to check its formats
|
||||
@ -120,7 +135,7 @@ class CheckLibrary(object):
|
||||
|
||||
# Fourth check: author directories that contain no titles
|
||||
if not found_titles:
|
||||
self.extra_authors.append((auth_dir, auth_dir))
|
||||
self.extra_authors.append((auth_dir, auth_dir, 0))
|
||||
|
||||
for x in self.book_dirs:
|
||||
try:
|
||||
@ -152,17 +167,20 @@ class CheckLibrary(object):
|
||||
unknowns = frozenset(filenames-formats-NORMALS)
|
||||
# Check: any books that aren't formats or normally there?
|
||||
for u in unknowns:
|
||||
self.extra_files.append((title_dir, os.path.join(db_path, u)))
|
||||
self.extra_files.append((title_dir,
|
||||
os.path.join(db_path, u), book_id))
|
||||
|
||||
# Check: any book formats that should be there?
|
||||
missing = book_formats - formats
|
||||
for m in missing:
|
||||
self.missing_formats.append((title_dir, os.path.join(db_path, m)))
|
||||
self.missing_formats.append((title_dir,
|
||||
os.path.join(db_path, m), book_id))
|
||||
|
||||
# Check: any book formats that shouldn't be there?
|
||||
extra = formats - book_formats - NORMALS
|
||||
for e in extra:
|
||||
self.extra_formats.append((title_dir, os.path.join(db_path, e)))
|
||||
self.extra_formats.append((title_dir,
|
||||
os.path.join(db_path, e), book_id))
|
||||
else:
|
||||
def lc_map(fnames, fset):
|
||||
m = {}
|
||||
@ -175,15 +193,28 @@ class CheckLibrary(object):
|
||||
unknowns = frozenset(filenames_lc-formats_lc-NORMALS)
|
||||
# Check: any books that aren't formats or normally there?
|
||||
for f in lc_map(filenames, unknowns):
|
||||
self.extra_files.append((title_dir, os.path.join(db_path, f)))
|
||||
self.extra_files.append((title_dir, os.path.join(db_path, f),
|
||||
book_id))
|
||||
|
||||
book_formats_lc = frozenset([f.lower() for f in book_formats])
|
||||
# Check: any book formats that should be there?
|
||||
missing = book_formats_lc - formats_lc
|
||||
for m in lc_map(book_formats, missing):
|
||||
self.missing_formats.append((title_dir, os.path.join(db_path, m)))
|
||||
self.missing_formats.append((title_dir,
|
||||
os.path.join(db_path, m), book_id))
|
||||
|
||||
# Check: any book formats that shouldn't be there?
|
||||
extra = formats_lc - book_formats_lc - NORMALS
|
||||
for e in lc_map(formats, extra):
|
||||
self.extra_formats.append((title_dir, os.path.join(db_path, e)))
|
||||
self.extra_formats.append((title_dir, os.path.join(db_path, e),
|
||||
book_id))
|
||||
|
||||
# check cached has_cover
|
||||
if self.db.has_cover(book_id):
|
||||
if 'cover.jpg' not in filenames:
|
||||
self.missing_covers.append((title_dir,
|
||||
os.path.join(db_path, title_dir, 'cover.jpg'), book_id))
|
||||
else:
|
||||
if 'cover.jpg' in filenames:
|
||||
self.extra_covers.append((title_dir,
|
||||
os.path.join(db_path, title_dir, 'cover.jpg'), book_id))
|
||||
|
||||
@ -801,6 +801,14 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
|
||||
if notify:
|
||||
self.notify('cover', [id])
|
||||
|
||||
def has_cover(self, id):
|
||||
return self.data.get(id, self.FIELD_MAP['cover'], row_is_id=True)
|
||||
|
||||
def set_has_cover(self, id, val):
|
||||
dval = 1 if val else 0
|
||||
self.conn.execute('UPDATE books SET has_cover=? WHERE id=?', (dval, id,))
|
||||
self.data.set(id, self.FIELD_MAP['cover'], val, row_is_id=True)
|
||||
|
||||
def book_on_device(self, id):
|
||||
if callable(self.book_on_device_func):
|
||||
return self.book_on_device_func(id)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user