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

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2017-06-11 16:52:24 +05:30
commit 00be7b7e66
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/search_box.py
View File

@ -567,7 +567,7 @@ class SavedSearchBoxMixin(object): # {{{
m = self.add_saved_search_button.menu()
m.clear()
m.addAction(QIcon(I('plus.png')), _('Add Saved search'), self.add_saved_search)
m.addAction(QIcon(I("search_copy_saved.png")), _('Get Saved search text'),
m.addAction(QIcon(I("search_copy_saved.png")), _('Get Saved search expression'),
self.get_saved_search_text)
m.addActions(list(self.save_search_button.menu().actions())[-1:])
m.addSeparator()
@ -602,9 +602,11 @@ class SavedSearchBoxMixin(object): # {{{
db = self.current_db
try:
current_search = self.search.currentText()
if not current_search.startswith('search:"'):
if not current_search.startswith('search:'):
raise ValueError()
current_search = current_search[8:-1].lstrip('=')
# This strange expression accounts for the four ways a search can be written:
# search:fff, search:"fff", search:"=fff". and search:="fff"
current_search = current_search[7:].lstrip('=').strip('"').lstrip('=')
current_search = db.saved_search_lookup(current_search)
if not current_search:
raise ValueError()