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

Adding books: When adding with auto-merge and auto-convert enabled, also run conversions for books into which the added files are merged. Fixes #1822018 [Does not auto-convert when adding existing book with overwrite selected](https://bugs.launchpad.net/calibre/+bug/1822018)

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-28 14:38:50 +05:30
parent b0543d1bb5
commit 4ffffb143d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/calibre/gui2/add.py
View File

@ -89,6 +89,7 @@ class Adder(QObject):
self.report = [] self.report = []
self.items = [] self.items = []
self.added_book_ids = set() self.added_book_ids = set()
self.merged_formats_added_to = set()
self.merged_books = set() self.merged_books = set()
self.added_duplicate_info = set() self.added_duplicate_info = set()
self.pd.show() self.pd.show()
@ -383,6 +384,7 @@ class Adder(QObject):
ib_fmts = {fmt.upper() for fmt in self.db.formats(identical_book_id)} ib_fmts = {fmt.upper() for fmt in self.db.formats(identical_book_id)}
seen_fmts |= ib_fmts seen_fmts |= ib_fmts
self.add_formats(identical_book_id, paths, mi, replace=replace) self.add_formats(identical_book_id, paths, mi, replace=replace)
self.merged_formats_added_to.add(identical_book_id)
if gprefs['automerge'] == 'new record': if gprefs['automerge'] == 'new record':
incoming_fmts = {path.rpartition(os.extsep)[-1].upper() for path in paths} incoming_fmts = {path.rpartition(os.extsep)[-1].upper() for path in paths}
if incoming_fmts.intersection(seen_fmts): if incoming_fmts.intersection(seen_fmts):
@ -490,7 +492,7 @@ class Adder(QObject):
if gprefs['manual_add_auto_convert'] and self.added_book_ids and self.parent() is not None: if gprefs['manual_add_auto_convert'] and self.added_book_ids and self.parent() is not None:
self.parent().iactions['Convert Books'].auto_convert_auto_add( self.parent().iactions['Convert Books'].auto_convert_auto_add(
self.added_book_ids) self.added_book_ids | self.merged_formats_added_to)
try: try:
if callable(self.callback): if callable(self.callback):