MycroftAI
/
mycroft-core
mirror of https://github.com/MycroftAI/mycroft-core.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Use sorted json to perform hash of settings

pull/1568/head
Åke Forslund 2018-02-09 09:32:43 +01:00 committed by Matthew D. Scholefield
parent 3894bc3641
commit 5447983999
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mycroft/skills/settings.py
View File

@ -92,7 +92,8 @@ class SkillSettings(dict):
# set file paths
self._settings_path = join(directory, 'settings.json')
self._meta_path = join(directory, 'settingsmeta.json')
self.loaded_hash = hash(frozenset(self.items()))
self.is_alive = True
self.loaded_hash = hash(json.dumps(self, sort_keys=True))
self._complete_intialization = False
self._device_identity = None
self._api_path = None
@ -176,7 +177,7 @@ class SkillSettings(dict):
@property
def _is_stored(self):
return hash(bytes(str(self), 'utf-8')) == self.loaded_hash
return hash(json.dumps(self, sort_keys=True)) == self.loaded_hash
def __getitem__(self, key):
""" Get key """
@ -547,7 +548,7 @@ class SkillSettings(dict):
if force or not self._is_stored:
with open(self._settings_path, 'w') as f:
json.dump(self, f)
self.loaded_hash = hash(bytes(str((self)), 'utf-8'))
self.loaded_hash = hash(json.dumps(self, sort_keys=True))
if self._should_upload_from_change:
settings_meta = self._load_settings_meta()