3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mqtt: support specifying fields in "status_objects" option 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2021-10-10 12:06:53 -04:00
parent 070e03d741
commit 0ed367d734
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
moonraker/components/mqtt.py
View File

@ -194,9 +194,24 @@ class MQTTClient(APITransport, Subscribable):
status_cfg = config.get("status_objects", None) status_cfg = config.get("status_objects", None)
self.status_objs: Dict[str, Any] = {} self.status_objs: Dict[str, Any] = {}
if status_cfg is not None: if status_cfg is not None:
status_cfg = status_cfg.strip() for line in status_cfg.strip().split('\n'):
self.status_objs = {k.strip(): None for k in status_cfg.split('\n') line = line.strip()
if k.strip()} if not line:
continue
parts = line.split('=', 1)
fields: Optional[List[str]]
if len(parts) == 1:
fields = None
if len(parts) == 2:
fields = [f.strip() for f in parts[1].split(',')
if f.strip()]
elif len(parts) != 1:
raise config.error(
"Format error in option 'status_object', "
f"section [mqtt]:\n{status_cfg}")
self.status_objs[parts[0].strip()] = fields
logging.debug(f"MQTT: Status Objects Set: {self.status_objs}")
self.server.register_event_handler("server:klippy_identified", self.server.register_event_handler("server:klippy_identified",
self._handle_klippy_identified) self._handle_klippy_identified)