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 #1036464 (Bulk Edit Search Saving broken). exception when saving a search/replace when no saved search/replace had been opened previously

Browse Source
This commit is contained in:
Kovid Goyal 2012-08-14 13:12:05 +05:30
commit a2776cd219
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/calibre/gui2/dialogs/metadata_bulk.py
View File

@ -529,6 +529,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
self.remove_button.clicked.connect(self.s_r_remove_query) self.remove_button.clicked.connect(self.s_r_remove_query)
self.queries = JSONConfig("search_replace_queries") self.queries = JSONConfig("search_replace_queries")
self.saved_search_name = ''
self.query_field.addItem("") self.query_field.addItem("")
self.query_field_values = sorted([q for q in self.queries], key=sort_key) self.query_field_values = sorted([q for q in self.queries], key=sort_key)
self.query_field.addItems(self.query_field_values) self.query_field.addItems(self.query_field_values)
@ -1034,11 +1035,16 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
self.queries.commit() self.queries.commit()
def s_r_save_query(self, *args): def s_r_save_query(self, *args):
dex = self.query_field_values.index(self.saved_search_name) names = ['']
names.extend(self.query_field_values)
try:
dex = names.index(self.saved_search_name)
except:
dex = 0
name = '' name = ''
while not name: while not name:
name, ok = QInputDialog.getItem(self, _('Save search/replace'), name, ok = QInputDialog.getItem(self, _('Save search/replace'),
_('Search/replace name:'), self.query_field_values, dex, True) _('Search/replace name:'), names, dex, True)
if not ok: if not ok:
return return
if not name: if not name:
@ -1086,6 +1092,7 @@ class MetadataBulkDialog(ResizableDialog, Ui_MetadataBulkDialog):
def s_r_query_change(self, item_name): def s_r_query_change(self, item_name):
if not item_name: if not item_name:
self.s_r_reset_query_fields() self.s_r_reset_query_fields()
self.saved_search_name = ''
return return
item = self.queries.get(unicode(item_name), None) item = self.queries.get(unicode(item_name), None)
if item is None: if item is None: