From 4ffffb143d08faba5571b835000705a129ec93c7 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Thu, 28 Mar 2019 14:38:50 +0530 Subject: [PATCH] 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) --- src/calibre/gui2/add.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py index 0429fb0cbb..d2b9e60cae 100644 --- a/src/calibre/gui2/add.py +++ b/src/calibre/gui2/add.py @@ -89,6 +89,7 @@ class Adder(QObject): self.report = [] self.items = [] self.added_book_ids = set() + self.merged_formats_added_to = set() self.merged_books = set() self.added_duplicate_info = set() self.pd.show() @@ -383,6 +384,7 @@ class Adder(QObject): ib_fmts = {fmt.upper() for fmt in self.db.formats(identical_book_id)} seen_fmts |= ib_fmts self.add_formats(identical_book_id, paths, mi, replace=replace) + self.merged_formats_added_to.add(identical_book_id) if gprefs['automerge'] == 'new record': incoming_fmts = {path.rpartition(os.extsep)[-1].upper() for path in paths} 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: self.parent().iactions['Convert Books'].auto_convert_auto_add( - self.added_book_ids) + self.added_book_ids | self.merged_formats_added_to) try: if callable(self.callback):