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

When bulk downloading metadata and the user deletes one of the books for which metadata is being downloaded, just ignore it, instead of erroring out

Browse Source
This commit is contained in:
Kovid Goyal 2012-05-28 21:16:53 +05:30
parent 4017e381a0
commit b4d6e46057
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/gui2/actions/edit_metadata.py
View File

@ -132,7 +132,7 @@ class EditMetadataAction(InterfaceAction):
for i in good_ids: for i in good_ids:
lm = db.metadata_last_modified(i, index_is_id=True) lm = db.metadata_last_modified(i, index_is_id=True)
if lm > lm_map[i]: if lm is not None and lm_map[i] is not None and lm > lm_map[i]:
title = db.title(i, index_is_id=True) title = db.title(i, index_is_id=True)
authors = db.authors(i, index_is_id=True) authors = db.authors(i, index_is_id=True)
if authors: if authors:
@ -516,18 +516,19 @@ class EditMetadataAction(InterfaceAction):
return self.finalize_apply() return self.finalize_apply()
i, mi = self.apply_id_map[self.apply_current_idx] i, mi = self.apply_id_map[self.apply_current_idx]
if isinstance(mi, tuple): if self.gui.current_db.has_id(i):
opf, cover = mi if isinstance(mi, tuple):
if opf: opf, cover = mi
mi = OPF(open(opf, 'rb'), basedir=os.path.dirname(opf), if opf:
populate_spine=False).to_book_metadata() mi = OPF(open(opf, 'rb'), basedir=os.path.dirname(opf),
populate_spine=False).to_book_metadata()
self.apply_mi(i, mi)
if cover:
self.gui.current_db.set_cover(i, open(cover, 'rb'),
notify=False, commit=False)
self.applied_ids.add(i)
else:
self.apply_mi(i, mi) self.apply_mi(i, mi)
if cover:
self.gui.current_db.set_cover(i, open(cover, 'rb'),
notify=False, commit=False)
self.applied_ids.add(i)
else:
self.apply_mi(i, mi)
self.apply_current_idx += 1 self.apply_current_idx += 1
if self.apply_pd is not None: if self.apply_pd is not None:

3
src/calibre/library/database2.py
View File

@ -1023,6 +1023,9 @@ class LibraryDatabase2(LibraryDatabase, SchemaUpgrade, CustomColumns):
return bool(self.conn.get('SELECT id FROM books where title=?', (title,), all=False)) return bool(self.conn.get('SELECT id FROM books where title=?', (title,), all=False))
return False return False
def has_id(self, id_):
return self.data._data[id_] is not None
def books_with_same_title(self, mi, all_matches=True): def books_with_same_title(self, mi, all_matches=True):
title = mi.title title = mi.title
ans = set() ans = set()