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

Move code that deals with the dirtied table into backend

Browse Source
This commit is contained in:
Kovid Goyal 2020-06-11 09:03:35 +05:30
parent 6bda5e6aad
commit 1002a9bcdd
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/calibre/db/backend.py
View File

@ -1756,6 +1756,16 @@ class DB(object):
else: else:
self.execute('DELETE FROM books_plugin_data WHERE name=?', (name,)) self.execute('DELETE FROM books_plugin_data WHERE name=?', (name,))
def dirtied_books(self):
for (book_id,) in self.execute('SELECT book FROM metadata_dirtied'):
yield book_id
def dirty_books(self, book_ids):
self.executemany('INSERT OR IGNORE INTO metadata_dirtied (book) VALUES (?)', ((x,) for x in book_ids))
def mark_book_as_clean(self, book_id):
self.execute('DELETE FROM metadata_dirtied WHERE book=?', (book_id,))
def get_ids_for_custom_book_data(self, name): def get_ids_for_custom_book_data(self, name):
return frozenset(r[0] for r in self.execute('SELECT book FROM books_plugin_data WHERE name=?', (name,))) return frozenset(r[0] for r in self.execute('SELECT book FROM books_plugin_data WHERE name=?', (name,)))

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

@ -212,8 +212,7 @@ class Cache(object):
@write_api @write_api
def initialize_dynamic(self): def initialize_dynamic(self):
self.dirtied_cache = {x:i for i, (x,) in enumerate( self.dirtied_cache = {x:i for i, x in enumerate(self.backend.dirtied_books())}
self.backend.execute('SELECT book FROM metadata_dirtied'))}
if self.dirtied_cache: if self.dirtied_cache:
self.dirtied_sequence = max(itervalues(self.dirtied_cache))+1 self.dirtied_sequence = max(itervalues(self.dirtied_cache))+1
self._initialize_dynamic_categories() self._initialize_dynamic_categories()
@ -1086,17 +1085,15 @@ class Cache(object):
self.dirtied_sequence = max(itervalues(already_dirtied)) + 1 self.dirtied_sequence = max(itervalues(already_dirtied)) + 1
self.dirtied_cache.update(already_dirtied) self.dirtied_cache.update(already_dirtied)
if new_dirtied: if new_dirtied:
self.backend.executemany('INSERT OR IGNORE INTO metadata_dirtied (book) VALUES (?)', self.backend.dirty_books(new_dirtied)
((x,) for x in new_dirtied))
new_dirtied = {book_id:self.dirtied_sequence+i for i, book_id in enumerate(new_dirtied)} new_dirtied = {book_id:self.dirtied_sequence+i for i, book_id in enumerate(new_dirtied)}
self.dirtied_sequence = max(itervalues(new_dirtied)) + 1 self.dirtied_sequence = max(itervalues(new_dirtied)) + 1
self.dirtied_cache.update(new_dirtied) self.dirtied_cache.update(new_dirtied)
@write_api @write_api
def commit_dirty_cache(self): def commit_dirty_cache(self):
book_ids = [(x,) for x in self.dirtied_cache] if self.dirtied_cache:
if book_ids: self.backend.dirty_books(self.dirtied_cache)
self.backend.executemany('INSERT OR IGNORE INTO metadata_dirtied (book) VALUES (?)', book_ids)
@write_api @write_api
def set_field(self, name, book_id_to_val_map, allow_case_change=True, do_path_update=True): def set_field(self, name, book_id_to_val_map, allow_case_change=True, do_path_update=True):
@ -1195,8 +1192,7 @@ class Cache(object):
# The last step is clearing the indicator # The last step is clearing the indicator
dc_sequence = self.dirtied_cache.get(book_id, None) dc_sequence = self.dirtied_cache.get(book_id, None)
if dc_sequence is None or sequence is None or dc_sequence == sequence: if dc_sequence is None or sequence is None or dc_sequence == sequence:
self.backend.execute('DELETE FROM metadata_dirtied WHERE book=?', self.backend.mark_book_as_clean(book_id)
(book_id,))
self.dirtied_cache.pop(book_id, None) self.dirtied_cache.pop(book_id, None)
@write_api @write_api