rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use dictionary for configuration mutable storage

Browse Source 
Includes a test for persistence of intermediate mutations in a
configuration file (i.e. more than one update) and a switch of the
_mutable attribute in configurations to a dictionary of (old, new)
values rather than (name, old, new). get_obj() now checks for an
existing mutable value and returns a reference to that value, only
making an initial copy; this preserves changes between update_mutables()
This commit is contained in:
Ryan Farley 2017-09-17 16:07:52 -05:00
parent b35a808712
commit c6ea0f8372
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
qutebrowser/config/config.py
View File

@ -379,7 +379,7 @@ class Config(QObject):
super().__init__(parent) super().__init__(parent)
self.changed.connect(_render_stylesheet.cache_clear) self.changed.connect(_render_stylesheet.cache_clear)
self._values = {} self._values = {}
self._mutables = [] self._mutables = {}
self._yaml = yaml_config self._yaml = yaml_config
def _set_value(self, opt, value): def _set_value(self, opt, value):
@ -426,7 +426,10 @@ class Config(QObject):
# Then we watch the returned object for changes. # Then we watch the returned object for changes.
if isinstance(obj, (dict, list)): if isinstance(obj, (dict, list)):
if mutable: if mutable:
self._mutables.append((name, copy.deepcopy(obj), obj)) if name not in self._mutables:
self._mutables[name] = (copy.deepcopy(obj), obj)
else:
obj = self._mutables[name][1]
else: else:
# Shouldn't be mutable (and thus hashable) # Shouldn't be mutable (and thus hashable)
assert obj.__hash__ is not None, obj assert obj.__hash__ is not None, obj
@ -470,11 +473,13 @@ class Config(QObject):
Here, we check all those saved copies for mutations, and if something Here, we check all those saved copies for mutations, and if something
mutated, we call set_obj again so we save the new value. mutated, we call set_obj again so we save the new value.
""" """
for name, old_value, new_value in self._mutables: for name, vals in self._mutables:
old_value = vals[0]
new_value = vals[1]
if old_value != new_value: if old_value != new_value:
log.config.debug("{} was mutated, updating".format(name)) log.config.debug("{} was mutated, updating".format(name))
self.set_obj(name, new_value, save_yaml=save_yaml) self.set_obj(name, new_value, save_yaml=save_yaml)
self._mutables = [] self._mutables = {}
def dump_userconfig(self): def dump_userconfig(self):
"""Get the part of the config which was changed by the user. """Get the part of the config which was changed by the user.