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

Fix transform running on incorrect container object

Browse Source
This commit is contained in:
Kovid Goyal 2021-11-11 10:00:34 +05:30
parent c75a9f718e
commit b50834b23d
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/calibre/gui2/tweak_book/boss.py
View File

@ -643,24 +643,24 @@ class Boss(QObject):
if ret != QDialog.DialogCode.Accepted: if ret != QDialog.DialogCode.Accepted:
return return
cc = current_container() mime_map = current_container().mime_map
names = () names = ()
if scope == 'current': if scope == 'current':
if not self.currently_editing or cc.mime_map.get(self.currently_editing) not in OEB_DOCS: if not self.currently_editing or mime_map.get(self.currently_editing) not in OEB_DOCS:
return error_dialog(self.gui, _('No HTML file'), _('Not currently editing an HTML file'), show=True) return error_dialog(self.gui, _('No HTML file'), _('Not currently editing an HTML file'), show=True)
names = (self.currently_editing,) names = (self.currently_editing,)
elif scope == 'open': elif scope == 'open':
names = tuple(name for name in editors if cc.mime_map.get(name) in OEB_DOCS) names = tuple(name for name in editors if mime_map.get(name) in OEB_DOCS)
if not names: if not names:
return error_dialog(self.gui, _('No HTML files'), _('Not currently editing any HTML files'), show=True) return error_dialog(self.gui, _('No HTML files'), _('Not currently editing any HTML files'), show=True)
elif scope == 'selected': elif scope == 'selected':
names = tuple(name for name in self.gui.file_list.file_list.selected_names if cc.mime_map.get(name) in OEB_DOCS) names = tuple(name for name in self.gui.file_list.file_list.selected_names if mime_map.get(name) in OEB_DOCS)
if not names: if not names:
return error_dialog(self.gui, _('No HTML files'), _('No HTML files are currently selected in the File browser'), show=True) return error_dialog(self.gui, _('No HTML files'), _('No HTML files are currently selected in the File browser'), show=True)
with BusyCursor(): with BusyCursor():
self.add_savepoint(_('Before HTML transformation')) self.add_savepoint(_('Before HTML transformation'))
try: try:
changed = transform_container(cc, last_used_html_transform_rules, names) changed = transform_container(current_container(), last_used_html_transform_rules, names)
except: except:
self.rewind_savepoint() self.rewind_savepoint()
raise raise
@ -668,9 +668,7 @@ class Boss(QObject):
self.apply_container_update_to_gui() self.apply_container_update_to_gui()
if not changed: if not changed:
self.rewind_savepoint() self.rewind_savepoint()
info_dialog(self.gui, _('No changes'), _( return info_dialog(self.gui, _('No changes'), _('No HTML was changed.'), show=True)
'No HTML was changed.'), show=True)
return
self.show_current_diff() self.show_current_diff()
def transform_styles(self): def transform_styles(self):