l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[modules/spaceapi] Performance optimization - JSON

Browse source 
The module now flattens the JSON structure when it is received from the
API endpoint instead of every time the statusbar is updated. This should
make the module much more performant.

Signed-off-by: Tobias Manske <tobias.manske@mailbox.org>
This commit is contained in:
Tobias Manske 2019-01-17 01:03:11 +01:00
parent 648de28df1
commit f53cd062ae
No known key found for this signature in database
GPG key ID: 978D99F12D4E041F
1 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
bumblebee/modules/spaceapi.py
View file

@ -52,14 +52,9 @@ def formatStringBuilder(s, json):
if len(j) != 3 and len(j) != 1: if len(j) != 3 and len(j) != 1:
return "INVALID FORMAT STRING" return "INVALID FORMAT STRING"
arr = j[0].split(".")
repl = json
for a in arr: # Walk the JSON tree to find replacement string
repl = repl[a]
if len(j) == 1: # no overwrite if len(j) == 1: # no overwrite
s = s.replace(i, repl) s = s.replace(i, json[j[0]])
elif repl: # overwrite for Trfor True elif json[j[0]]: # overwrite for True
s = s.replace(i, j[1]) s = s.replace(i, j[1])
else: # overwrite for False else: # overwrite for False
s = s.replace(i, j[2]) s = s.replace(i, j[2])
@ -91,7 +86,7 @@ class Module(bumblebee.engine.Module):
try: try:
if self._error is not None: if self._error is not None:
return ["critical"] return ["critical"]
elif self._data["state"]["open"]: elif self._data["state.open"]:
return ["warning"] return ["warning"]
else: else:
return [] return []
@ -122,7 +117,7 @@ class Module(bumblebee.engine.Module):
with requests.get(self._url, timeout=10) as request: with requests.get(self._url, timeout=10) as request:
# Can't implement error handling for python2.7 if I use # Can't implement error handling for python2.7 if I use
# request.json() as it uses simplejson in newer versions # request.json() as it uses simplejson in newer versions
self._data = json.loads(request.text) self._data = self.__flatten(json.loads(request.text))
self._error = None self._error = None
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
self._error = "Timeout" self._error = "Timeout"
@ -136,6 +131,20 @@ class Module(bumblebee.engine.Module):
self._threadingCount += 300 self._threadingCount += 300
self._error = "RELOADING" self._error = "RELOADING"
# Flattens the JSON structure recursively, e.g. ["space"]["open"]
# becomes ["space.open"]
def __flatten(self, json):
out = {}
for key in json:
value = json[key]
if type(value) is dict:
flattened_key = self.__flatten(value)
for fk in flattened_key:
out[key + "." + fk] = flattened_key[fk]
else:
out[key] = value
return out
# Author: Tobias Manske <tobias@chaoswg.xyz> # Author: Tobias Manske <tobias@chaoswg.xyz>
# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4