Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-08-11 09:13:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clear the composites cache correctly

Browse Source
This commit is contained in:
Kovid Goyal 2013-07-20 10:26:38 +05:30
parent 26fcfc70f1
commit fb45095153
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -83,7 +83,7 @@ class Cache(object):
def __init__(self, backend): def __init__(self, backend):
self.backend = backend self.backend = backend
self.fields = {} self.fields = {}
self.composites = set() self.composites = {}
self.read_lock, self.write_lock = create_locks() self.read_lock, self.write_lock = create_locks()
self.format_metadata_cache = defaultdict(dict) self.format_metadata_cache = defaultdict(dict)
self.formatter_template_cache = {} self.formatter_template_cache = {}
@ -144,6 +144,11 @@ class Cache(object):
def initialize_template_cache(self): def initialize_template_cache(self):
self.formatter_template_cache = {} self.formatter_template_cache = {}
@write_api
def clear_composite_caches(self, book_ids=None):
for field in self.composites.itervalues():
field.clear_caches(book_ids=book_ids)
@write_api @write_api
def clear_caches(self, book_ids=None): def clear_caches(self, book_ids=None):
self._initialize_template_cache() # Clear the formatter template cache self._initialize_template_cache() # Clear the formatter template cache
@ -265,7 +270,7 @@ class Cache(object):
for field, table in self.backend.tables.iteritems(): for field, table in self.backend.tables.iteritems():
self.fields[field] = create_field(field, table) self.fields[field] = create_field(field, table)
if table.metadata['datatype'] == 'composite': if table.metadata['datatype'] == 'composite':
self.composites.add(field) self.composites[field] = self.fields[field]
self.fields['ondevice'] = create_field('ondevice', self.fields['ondevice'] = create_field('ondevice',
VirtualTable('ondevice')) VirtualTable('ondevice'))
@ -788,11 +793,13 @@ class Cache(object):
@write_api @write_api
def update_last_modified(self, book_ids, now=None): def update_last_modified(self, book_ids, now=None):
if now is None:
now = nowf()
if book_ids: if book_ids:
if now is None:
now = nowf()
f = self.fields['last_modified'] f = self.fields['last_modified']
f.writer.set_books({book_id:now for book_id in book_ids}, self.backend) f.writer.set_books({book_id:now for book_id in book_ids}, self.backend)
if self.composites:
self._clear_composite_caches(book_ids)
@write_api @write_api
def mark_as_dirty(self, book_ids): def mark_as_dirty(self, book_ids):
@ -846,10 +853,6 @@ class Cache(object):
sf = self.fields[f.name+'_index'] sf = self.fields[f.name+'_index']
dirtied |= sf.writer.set_books(simap, self.backend, allow_case_change=False) dirtied |= sf.writer.set_books(simap, self.backend, allow_case_change=False)
if dirtied and self.composites:
for name in self.composites:
self.fields[name].clear_caches(book_ids=dirtied)
if dirtied and update_path and do_path_update: if dirtied and update_path and do_path_update:
self._update_path(dirtied, mark_as_dirtied=False) self._update_path(dirtied, mark_as_dirtied=False)