Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bug #1918428: virtual_libraries() performance improvement

Browse Source
This commit is contained in:
Charles Haley 2021-03-11 12:34:50 +00:00
parent b2551d986e
commit 080f9226d9
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/db/cache.py
View File

@ -141,6 +141,7 @@ class Cache(object):
self.format_metadata_cache = defaultdict(dict) self.format_metadata_cache = defaultdict(dict)
self.formatter_template_cache = {} self.formatter_template_cache = {}
self.dirtied_cache = {} self.dirtied_cache = {}
self.vls_for_books_cache = {}
self.dirtied_sequence = 0 self.dirtied_sequence = 0
self.cover_caches = set() self.cover_caches = set()
self.clear_search_cache_count = 0 self.clear_search_cache_count = 0
@ -249,6 +250,7 @@ class Cache(object):
def clear_search_caches(self, book_ids=None): def clear_search_caches(self, book_ids=None):
self.clear_search_cache_count += 1 self.clear_search_cache_count += 1
self._search_api.update_or_clear(self, book_ids) self._search_api.update_or_clear(self, book_ids)
self.vls_for_books_cache = {}
@read_api @read_api
def last_modified(self): def last_modified(self):
@ -2207,14 +2209,25 @@ class Cache(object):
@read_api @read_api
def virtual_libraries_for_books(self, book_ids): def virtual_libraries_for_books(self, book_ids):
if not self.vls_for_books_cache:
# Using a list is slightly faster than a set. Use a local var to
# avoid the 'self' double lookup
c = {book:list() for book in self.all_book_ids()}
libraries = self._pref('virtual_libraries', {}) libraries = self._pref('virtual_libraries', {})
ans = {book_id:[] for book_id in book_ids}
for lib, expr in iteritems(libraries): for lib, expr in iteritems(libraries):
books = self._search(expr) # We deliberately dont use book_ids as we want to use the search cache for book in self._search(expr):
for book in book_ids: c[book].append(lib)
if book in books: # The 'world' says it is safe to modify items in a dict while iterating.
ans[book].append(lib) for b,l in iteritems(self.vls_for_books_cache):
return {k:tuple(sorted(v, key=sort_key)) for k, v in iteritems(ans)} c[b] = tuple(sorted(l, key=sort_key))
self.vls_for_books_cache = c
if not book_ids:
book_ids = self._all_book_ids()
# book_ids is usually 1 long. The loop will be faster than a comprehension
r = {}
for b in book_ids:
r[b] = self.vls_for_books_cache[b]
return r
@read_api @read_api
def user_categories_for_books(self, book_ids, proxy_metadata_map=None): def user_categories_for_books(self, book_ids, proxy_metadata_map=None):