Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-10-31 02:27:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1821968 [Epub Catalog using some former value](https://bugs.launchpad.net/calibre/+bug/1821968)

Browse Source
This commit is contained in:
Kovid Goyal 2019-03-29 13:16:23 +05:30
parent a67857483f
commit e9ef5296e7
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/catalog/catalog_epub_mobi.py
View File

@ -498,12 +498,6 @@ class PluginWidget(QWidget,Ui_Form):
elif self.merge_after.isChecked(): elif self.merge_after.isChecked():
checked = 'after' checked = 'after'
include_hr = self.include_hr.isChecked() include_hr = self.include_hr.isChecked()
opts_dict['merge_comments_rule'] = "%s:%s:%s" % \
(self.merge_source_field_name, checked, include_hr)
opts_dict['header_note_source_field'] = self.header_note_source_field_name
opts_dict['genre_source_field'] = self.genre_source_field_name
# Init self.merge_source_field_name # Init self.merge_source_field_name
self.merge_source_field_name = '' self.merge_source_field_name = ''
@ -526,6 +520,13 @@ class PluginWidget(QWidget,Ui_Form):
genre_source_spec = self.genre_source_fields[cs] genre_source_spec = self.genre_source_fields[cs]
self.genre_source_field_name = genre_source_spec['field'] self.genre_source_field_name = genre_source_spec['field']
opts_dict['merge_comments_rule'] = "%s:%s:%s" % \
(self.merge_source_field_name, checked, include_hr)
opts_dict['header_note_source_field'] = self.header_note_source_field_name
opts_dict['genre_source_field'] = self.genre_source_field_name
# Fix up exclude_genre regex if blank. Assume blank = no exclusions # Fix up exclude_genre regex if blank. Assume blank = no exclusions
if opts_dict['exclude_genre'] == '': if opts_dict['exclude_genre'] == '':
opts_dict['exclude_genre'] = 'a^' opts_dict['exclude_genre'] = 'a^'