forked from Narcissus/pylibmeshctrl
Compare commits
5 Commits
fix/device
...
fix/device
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5947e48c5b | ||
|
|
31a8f00cd0 | ||
|
|
871d36b334 | ||
|
|
59fb1f104e | ||
|
|
9bd3e10ed7 |
@@ -2,6 +2,17 @@
|
||||
Changelog
|
||||
=========
|
||||
|
||||
version 1.2.0
|
||||
=============
|
||||
|
||||
Bugs:
|
||||
* Fixed agent sometimes being None causing an oxception
|
||||
* Fixed bad code in device_open_url
|
||||
|
||||
Features:
|
||||
* Changed websockets version to 15. This now uses the proxy implemention from that library, instead of the previous hack.
|
||||
* Added lastaddr and lastconnect to list_devices API
|
||||
|
||||
version 1.1.2
|
||||
=============
|
||||
Bugs:
|
||||
|
||||
@@ -478,7 +478,18 @@ class Session(object):
|
||||
if "result" in res0:
|
||||
raise exceptions.ServerError(res0["result"])
|
||||
if details:
|
||||
nodes = json.loads(res0["data"])
|
||||
try:
|
||||
nodes = res0["data"]
|
||||
# Accept any number of nested strings, meshcentral is odd
|
||||
while True:
|
||||
try:
|
||||
nodes = json.loads(nodes)
|
||||
except TypeError:
|
||||
break
|
||||
except Exception as e:
|
||||
print(f"Failed to parse device data: {e}")
|
||||
return
|
||||
|
||||
for node in nodes:
|
||||
if node["node"].get("meshid", None):
|
||||
node["node"]["mesh"] = mesh.Mesh(node["node"].get("meshid"), self)
|
||||
|
||||
Reference in New Issue
Block a user