From e6c651c5bfabaec3439344ad1191cea0f3c4980b Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 4 Oct 2020 18:08:49 +0530 Subject: [PATCH] ... --- src/calibre/db/search.py | 6 +++--- src/calibre/utils/search_query_parser.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/db/search.py b/src/calibre/db/search.py index 20a901a02d..3d8c6aba5d 100644 --- a/src/calibre/db/search.py +++ b/src/calibre/db/search.py @@ -926,7 +926,7 @@ class Search(object): finally: sqp.dbcache = sqp.lookup_saved_search = None - def _use_cache(self, sqp, dbcache, query): + def query_is_cacheable(self, sqp, dbcache, query): if query: for name, value in sqp.get_queried_fields(query): if name == 'template' and '#@#:d:' in value: @@ -949,7 +949,7 @@ class Search(object): query = query.decode('utf-8') query = query.strip() - use_cache = self._use_cache(sqp, dbcache, query) + use_cache = self.query_is_cacheable(sqp, dbcache, query) if use_cache and book_ids is None and query and not search_restriction: cached = self.cache.get(query) @@ -960,7 +960,7 @@ class Search(object): if search_restriction and search_restriction.strip(): sr = search_restriction.strip() sqp.all_book_ids = all_book_ids if book_ids is None else book_ids - if self._use_cache(sqp, dbcache, sr): + if self.query_is_cacheable(sqp, dbcache, sr): cached = self.cache.get(sr) if cached is None: restricted_ids = sqp.parse(sr) diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py index 0463770b01..d639424483 100644 --- a/src/calibre/utils/search_query_parser.py +++ b/src/calibre/utils/search_query_parser.py @@ -351,7 +351,7 @@ class SearchQueryParser(object): yield from self._walk_expr(self._get_tree( self._get_saved_search_text(tree[2]))) else: - yield (tree[1], tree[2]) + yield tree[1], tree[2] def parse(self, query, candidates=None): # empty the list of searches used for recursion testing