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

Oops, forgot to move test for lock failure above cache access

Browse Source
This commit is contained in:
Kovid Goyal 2021-05-06 15:18:11 +05:30
parent 5ff45a7ee7
commit dc88a74caa
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2235,18 +2235,18 @@ class Cache(object):
# the cache and that recursive calls don't do the update. This # the cache and that recursive calls don't do the update. This
# method can recurse via self._search() # method can recurse via self._search()
with try_lock(self.vls_cache_lock) as got_lock: with try_lock(self.vls_cache_lock) as got_lock:
# Using a list is slightly faster than a set.
c = defaultdict(list)
if not got_lock:
# We get here if resolving the books in a VL triggers another VL
# calculation. This can be 'real' recursion, in which case the
# eventual answer will be wrong. It can also be a search using
# a location of 'all' that causes evaluation of a composite that
# references virtual_libraries(). If the composite isn't used in a
# VL then the eventual answer will be correct because get_metadata
# will clear the caches.
return c
if self.vls_for_books_cache is None: if self.vls_for_books_cache is None:
# Using a list is slightly faster than a set.
c = defaultdict(list)
if not got_lock:
# We get here if resolving the books in a VL triggers another VL
# calculation. This can be 'real' recursion, in which case the
# eventual answer will be wrong. It can also be a search using
# a location of 'all' that causes evaluation of a composite that
# references virtual_libraries(). If the composite isn't used in a
# VL then the eventual answer will be correct because get_metadata
# will clear the caches.
return c
self.vls_for_books_cache_is_loading = True self.vls_for_books_cache_is_loading = True
libraries = self._pref('virtual_libraries', {}) libraries = self._pref('virtual_libraries', {})
for lib, expr in libraries.items(): for lib, expr in libraries.items():