From 86a83be17d5d0b72fbc2d7d333192ffce3f19de6 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 19 Aug 2017 21:05:05 +0530 Subject: [PATCH] Better error message when using an unknown saved search --- src/calibre/utils/search_query_parser.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py index 015b8f22e9..9fac66289c 100644 --- a/src/calibre/utils/search_query_parser.py +++ b/src/calibre/utils/search_query_parser.py @@ -396,7 +396,10 @@ class SearchQueryParser(object): raise ParseException(_('Recursive saved search: {0}').format(query)) if self.recurse_level > 5: self.searches_seen.add(query) - return self._parse(self.lookup_saved_search(query), candidates) + ss = self.lookup_saved_search(query) + if ss is None: + raise ParseException(_('Unknown saved search: {}').format(query)) + return self._parse(ss, candidates) except ParseException as e: raise e except: # convert all exceptions (e.g., missing key) to a parse error