mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Matter save fabrics more robust (#20847)

This commit is contained in:
s-hadinger 2024-03-02 08:32:10 +01:00 committed by GitHub
parent b06c310305
commit 6a35795178
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 976 additions and 945 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/libesp32/berry_matter/src/embedded/Matter_Session_Store.be
View File

@ -35,7 +35,8 @@ class Matter_Session_Store
var device # device root object var device # device root object
var sessions var sessions
var fabrics # list of provisioned fabrics var fabrics # list of provisioned fabrics
static var _FABRICS = "_matter_fabrics.json" static var _FABRICS = "/_matter_fabrics.json"
static var _FABRICS_TEMP = "/_matter_fabrics.tmp" # temporary saved file before renaming to _FABRICS
############################################################# #############################################################
def init(device) def init(device)
@ -318,12 +319,13 @@ class Matter_Session_Store
############################################################# #############################################################
def save_fabrics() def save_fabrics()
import json import json
import path
try try
self.remove_expired() # clean before saving self.remove_expired() # clean before saving
var sessions_saved = 0 var sessions_saved = 0
var fabrics_saved = 0 var fabrics_saved = 0
var f = open(self._FABRICS, "w") var f = open(self._FABRICS_TEMP, "w")
f.write("[") f.write("[")
for fab : self.fabrics.persistables() for fab : self.fabrics.persistables()
@ -337,8 +339,14 @@ class Matter_Session_Store
f.write("]") f.write("]")
f.close() f.close()
tasmota.log(f"MTR: =Saved {fabrics_saved} fabric(s) and {sessions_saved} session(s)", 2) # saving went well, now remove previous version and rename
self.device.event_fabrics_saved() # signal event path.remove(self._FABRICS)
if (path.rename(self._FABRICS_TEMP, self._FABRICS))
tasmota.log(f"MTR: =Saved {fabrics_saved} fabric(s) and {sessions_saved} session(s)", 2)
self.device.event_fabrics_saved() # signal event
else
tasmota.log(f"MTR: Saving Fabrics failed", 2)
end
except .. as e, m except .. as e, m
tasmota.log("MTR: Session_Store::save Exception:" + str(e) + "|" + str(m), 2) tasmota.log("MTR: Session_Store::save Exception:" + str(e) + "|" + str(m), 2)
end end

1905
lib/libesp32/berry_matter/src/solidify/solidified_Matter_Session_Store.h
View File

File diff suppressed because it is too large Load Diff