feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Fix an issue saving modified State

Browse Source
This commit is contained in:
Ivan Kravets
2019-07-02 15:52:12 +03:00
parent 148b7dccfd
commit c79d5f0cf1
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
platformio/app.py
View File

@ -94,7 +94,7 @@ class State(object):
self.path = join(get_project_core_dir(), "appstate.json") self.path = join(get_project_core_dir(), "appstate.json")
self._storage = {} self._storage = {}
self._lockfile = None self._lockfile = None
self._modified = False self.modified = False
def __enter__(self): def __enter__(self):
try: try:
@ -108,7 +108,7 @@ class State(object):
return self return self
def __exit__(self, type_, value, traceback): def __exit__(self, type_, value, traceback):
if self._modified: if self.modified:
try: try:
with open(self.path, "w") as fp: with open(self.path, "w") as fp:
fp.write(dump_json_to_unicode(self._storage)) fp.write(dump_json_to_unicode(self._storage))
@ -141,18 +141,18 @@ class State(object):
return self._storage.get(key, default) return self._storage.get(key, default)
def update(self, *args, **kwargs): def update(self, *args, **kwargs):
self._modified = True self.modified = True
return self._storage.update(*args, **kwargs) return self._storage.update(*args, **kwargs)
def __getitem__(self, key): def __getitem__(self, key):
return self._storage[key] return self._storage[key]
def __setitem__(self, key, value): def __setitem__(self, key, value):
self._modified = True self.modified = True
self._storage[key] = value self._storage[key] = value
def __delitem__(self, key): def __delitem__(self, key):
self._modified = True self.modified = True
del self._storage[key] del self._storage[key]
def __contains__(self, item): def __contains__(self, item):
@ -315,19 +315,20 @@ def sanitize_setting(name, value):
def get_state_item(name, default=None): def get_state_item(name, default=None):
with State() as data: with State() as state:
return data.get(name, default) return state.get(name, default)
def set_state_item(name, value): def set_state_item(name, value):
with State(lock=True) as data: with State(lock=True) as state:
data[name] = value state[name] = value
state.modified = True
def delete_state_item(name): def delete_state_item(name):
with State(lock=True) as data: with State(lock=True) as state:
if name in data: if name in state:
del data[name] del state[name]
def get_setting(name): def get_setting(name):
@ -335,24 +336,25 @@ def get_setting(name):
if _env_name in environ: if _env_name in environ:
return sanitize_setting(name, getenv(_env_name)) return sanitize_setting(name, getenv(_env_name))
with State() as data: with State() as state:
if "settings" in data and name in data['settings']: if "settings" in state and name in state['settings']:
return data['settings'][name] return state['settings'][name]
return DEFAULT_SETTINGS[name]['value'] return DEFAULT_SETTINGS[name]['value']
def set_setting(name, value): def set_setting(name, value):
with State(lock=True) as data: with State(lock=True) as state:
if "settings" not in data: if "settings" not in state:
data['settings'] = {} state['settings'] = {}
data['settings'][name] = sanitize_setting(name, value) state['settings'][name] = sanitize_setting(name, value)
state.modified = True
def reset_settings(): def reset_settings():
with State(lock=True) as data: with State(lock=True) as state:
if "settings" in data: if "settings" in state:
del data['settings'] del state['settings']
def get_session_var(name, default=None): def get_session_var(name, default=None):