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

Better comparison for app state changes

Browse Source
This commit is contained in:
Ivan Kravets
2019-07-01 20:42:23 +03:00
parent bf77d70d82
commit 6d9de80f12
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
platformio/app.py
View File

@ -14,9 +14,9 @@
import codecs
import hashlib
import json
import os
import uuid
from copy import deepcopy
from os import environ, getenv, listdir, remove
from os.path import abspath, dirname, expanduser, isdir, isfile, join
from time import time
@ -94,27 +94,28 @@ class State(object):
if not self.path:
self.path = join(get_project_core_dir(), "appstate.json")
self._state = {}
self._prev_state = {}
self._prev_state_raw = ""
self._lockfile = None
def __enter__(self):
try:
self._lock_state_file()
if isfile(self.path):
self._state = util.load_json(self.path)
with open(self.path) as fp:
self._prev_state_raw = fp.read().strip()
self._state = json.loads(self._prev_state_raw)
assert isinstance(self._state, dict)
except (AssertionError, UnicodeDecodeError,
exception.PlatformioException):
except (AssertionError, ValueError, UnicodeDecodeError):
self._state = {}
self._prev_state = deepcopy(self._state)
self._prev_state_raw = ""
return self._state
def __exit__(self, type_, value, traceback):
new_state = dump_json_to_unicode(self._state)
if self._prev_state != new_state:
new_state_raw = dump_json_to_unicode(self._state)
if self._prev_state_raw != new_state_raw:
try:
with open(self.path, "w") as fp:
fp.write(new_state)
fp.write(new_state_raw)
except IOError:
raise exception.HomeDirPermissionsError(get_project_core_dir())
self._unlock_state_file()

5
platformio/compat.py
View File

@ -58,7 +58,8 @@ if PY2:
return obj
return json.dumps(obj,
encoding=get_filesystem_encoding(),
ensure_ascii=False).encode("utf8")
ensure_ascii=False,
sort_keys=True).encode("utf8")
_magic_check = re.compile('([*?[])')
_magic_check_bytes = re.compile(b'([*?[])')
@ -104,4 +105,4 @@ else:
def dump_json_to_unicode(obj):
if isinstance(obj, string_types):
return obj
return json.dumps(obj, ensure_ascii=False)
return json.dumps(obj, ensure_ascii=False, sort_keys=True)