updated for rich logging stuff
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import json
|
||||
import logging
|
||||
import sys
|
||||
from copy import deepcopy
|
||||
from pathlib import Path
|
||||
|
||||
from appdaemon.plugins.hass.hassapi import Hass
|
||||
@@ -8,39 +8,45 @@ from appdaemon.plugins.mqtt.mqttapi import Mqtt
|
||||
|
||||
rc_path = (Path(__file__).resolve().parents[1] / 'room_control').as_posix()
|
||||
sys.path.insert(0, rc_path)
|
||||
|
||||
from console import console, init_logging, deinit_logging
|
||||
from console import console, setup_component_logging
|
||||
|
||||
|
||||
class AqaraCube(Hass, Mqtt):
|
||||
def initialize(self):
|
||||
if (level := self.args.get('rich', False)):
|
||||
init_logging(self, level)
|
||||
setup_component_logging(self)
|
||||
self.logger.setLevel(logging.DEBUG)
|
||||
# self.logger = logging.getLogger()
|
||||
|
||||
# if (level := self.args.get('rich', False)):
|
||||
# init_logging(self, level)
|
||||
|
||||
# for name, logger in logging.Logger.manager.loggerDict.items():
|
||||
# logger = logging.getLogger(name)
|
||||
# if logger.hasHandlers():
|
||||
# self.log(f'[yellow]{name.ljust(25)}[/]{type(logger).__name__}', )
|
||||
# for handler in logger.handlers:
|
||||
# self.log(f' {type(handler).__name__}: {type(handler.formatter).__name__}')
|
||||
|
||||
topic = f'zigbee2mqtt/{self.args["cube"]}'
|
||||
self.mqtt_subscribe(topic, namespace='mqtt')
|
||||
self.listen_event(self.handle_event, 'MQTT_MESSAGE', topic=topic, namespace='mqtt')
|
||||
self.log(f'Listening for cube events on: {topic}')
|
||||
self.log(f'Listening for cube events on: [topic]{topic}[/]')
|
||||
|
||||
self.app = self.get_app(self.args['app'])
|
||||
self.log(f'Connected to other app: {self.app.name}')
|
||||
self.log(f'Connected to AD app: [room]{self.app.name}[/]')
|
||||
|
||||
def terminate(self):
|
||||
self.log('[bold red]Terminating[/]', level='DEBUG')
|
||||
deinit_logging(self)
|
||||
self.log('Success', level='DEBUG')
|
||||
|
||||
def handle_event(self, event_name, data, cb_args):
|
||||
topic_prefix, cube_name = data['topic'].split('/')
|
||||
self.log(f'{event_name} on [bright_black]{topic_prefix}/[/][blue]{cube_name}[/]', data, level='DEBUG')
|
||||
|
||||
payload = json.loads(data['payload'])
|
||||
action = payload['action']
|
||||
|
||||
if action == '' or action == 'wakeup':
|
||||
return
|
||||
else:
|
||||
self.log(json.dumps(payload, indent=2), level='DEBUG')
|
||||
log_msg = f'{event_name} on [topic]{data["topic"]}[/], Action: "[yellow]{str(action)}[/]"\n'
|
||||
self.log(log_msg + json.dumps(payload, indent=2), level='DEBUG')
|
||||
if (arg := self.args.get(action, False)):
|
||||
self.action_handler(action=action, description=arg)
|
||||
elif handler := getattr(self, f'handle_{action}', None):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
cube1:
|
||||
module: cube
|
||||
class: AqaraCube
|
||||
rich: INFO
|
||||
rich: DEBUG
|
||||
cube: Cube 1
|
||||
app: bedroom
|
||||
flip90: toggle
|
||||
|
||||
Reference in New Issue
Block a user