From a67857483f85363944458a54eaf2f9e159e4d5b8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 29 Mar 2019 09:00:04 +0530 Subject: [PATCH] EPUB/MOBI Catalogs: Fix presets not being applied for some options. Fixes #1821968 [Epub Catalog using some former value](https://bugs.launchpad.net/calibre/+bug/1821968) --- src/calibre/gui2/catalog/catalog_epub_mobi.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 3ea94eb7f6..a0ef67f659 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -505,6 +505,27 @@ class PluginWidget(QWidget,Ui_Form): opts_dict['genre_source_field'] = self.genre_source_field_name + # Init self.merge_source_field_name + self.merge_source_field_name = '' + cs = unicode_type(self.merge_source_field.currentText()) + if cs and cs in self.merge_source_fields: + merge_source_spec = self.merge_source_fields[cs] + self.merge_source_field_name = merge_source_spec['field'] + + # Init self.header_note_source_field_name + self.header_note_source_field_name = '' + cs = unicode_type(self.header_note_source_field.currentText()) + if cs and cs in self.header_note_source_fields: + header_note_source_spec = self.header_note_source_fields[cs] + self.header_note_source_field_name = header_note_source_spec['field'] + + # Init self.genre_source_field_name + self.genre_source_field_name = _('Tags') + cs = unicode_type(self.genre_source_field.currentText()) + if cs != _('Tags') and cs and cs in self.genre_source_fields: + genre_source_spec = self.genre_source_fields[cs] + self.genre_source_field_name = genre_source_spec['field'] + # Fix up exclude_genre regex if blank. Assume blank = no exclusions if opts_dict['exclude_genre'] == '': opts_dict['exclude_genre'] = 'a^'