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

Metadata backup: Try to ensure that a dirtied book is not ignored during shutdown

Browse Source
This commit is contained in:
Kovid Goyal 2010-09-29 18:16:18 -06:00
parent e199c00cc9
commit 6608dc2cd4
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/calibre/gui2/ui.py
View File

@ -579,6 +579,9 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, # {{{
except KeyboardInterrupt: except KeyboardInterrupt:
pass pass
time.sleep(2) time.sleep(2)
if mb is not None:
mb.flush()
QApplication.processEvents()
self.hide_windows() self.hide_windows()
return True return True

11
src/calibre/library/caches.py
View File

@ -40,12 +40,14 @@ class MetadataBackup(Thread): # {{{
self.get_metadata_for_dump = FunctionDispatcher(db.get_metadata_for_dump) self.get_metadata_for_dump = FunctionDispatcher(db.get_metadata_for_dump)
self.clear_dirtied = FunctionDispatcher(db.clear_dirtied) self.clear_dirtied = FunctionDispatcher(db.clear_dirtied)
self.set_dirtied = FunctionDispatcher(db.dirtied) self.set_dirtied = FunctionDispatcher(db.dirtied)
self.in_limbo = None
def stop(self): def stop(self):
self.keep_running = False self.keep_running = False
def run(self): def run(self):
while self.keep_running: while self.keep_running:
self.in_limbo = None
try: try:
time.sleep(0.5) # Limit to two per second time.sleep(0.5) # Limit to two per second
id_ = self.db.dirtied_queue.get(True, 1.45) id_ = self.db.dirtied_queue.get(True, 1.45)
@ -72,6 +74,7 @@ class MetadataBackup(Thread): # {{{
if mi is None: if mi is None:
continue continue
self.in_limbo = id_
# Give the GUI thread a chance to do something. Python threads don't # Give the GUI thread a chance to do something. Python threads don't
# have priorities, so this thread would naturally keep the processor # have priorities, so this thread would naturally keep the processor
@ -99,6 +102,14 @@ class MetadataBackup(Thread): # {{{
'again, giving up') 'again, giving up')
continue continue
def flush(self):
'Used during shutdown to ensure that a dirtied book is not missed'
if self.in_limbo is not None:
try:
self.set_dirtied([self.in_limbo])
except:
traceback.print_exc()
def write(self, path, raw): def write(self, path, raw):
with open(path, 'wb') as f: with open(path, 'wb') as f:
f.write(raw) f.write(raw)