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

Only write to gui.json once during shutdown

Browse Source
This commit is contained in:
Kovid Goyal 2012-07-26 00:20:12 +05:30
parent 382248eff1
commit cf06ad7e67
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,6 +702,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
self.read_layout_settings() self.read_layout_settings()
def write_settings(self): def write_settings(self):
with gprefs: # Only write to gprefs once
config.set('main_window_geometry', self.saveGeometry()) config.set('main_window_geometry', self.saveGeometry())
dynamic.set('sort_history', self.library_view.model().sort_history) dynamic.set('sort_history', self.library_view.model().sort_history)
self.save_layout_state() self.save_layout_state()

9
src/calibre/utils/config.py
View File

@ -240,6 +240,7 @@ class XMLConfig(dict):
def __init__(self, rel_path_to_cf_file): def __init__(self, rel_path_to_cf_file):
dict.__init__(self) dict.__init__(self)
self.no_commit = False
self.defaults = {} self.defaults = {}
self.file_path = os.path.join(config_dir, self.file_path = os.path.join(config_dir,
*(rel_path_to_cf_file.split('/'))) *(rel_path_to_cf_file.split('/')))
@ -304,6 +305,7 @@ class XMLConfig(dict):
self.commit() self.commit()
def commit(self): def commit(self):
if self.no_commit: return
if hasattr(self, 'file_path') and self.file_path: if hasattr(self, 'file_path') and self.file_path:
dpath = os.path.dirname(self.file_path) dpath = os.path.dirname(self.file_path)
if not os.path.exists(dpath): if not os.path.exists(dpath):
@ -314,6 +316,13 @@ class XMLConfig(dict):
f.truncate() f.truncate()
f.write(raw) f.write(raw)
def __enter__(self):
self.no_commit = True
def __exit__(self, *args):
self.no_commit = False
self.commit()
def to_json(obj): def to_json(obj):
if isinstance(obj, bytearray): if isinstance(obj, bytearray):
return {'__class__': 'bytearray', return {'__class__': 'bytearray',