smarthome/exec_command
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Enable / disable implemented

Browse Source
This commit is contained in:
Dirk Alders 2022-09-28 18:21:09 +02:00
parent ca1e61c155
commit 5974ec1c8b
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
example_config/config.py
View File

@ -9,6 +9,8 @@ MQTT_USER = "user"
MQTT_PASS = "pass" MQTT_PASS = "pass"
MQTT_SERVER = "host" MQTT_SERVER = "host"
ENABLED_TOPIC = 'topic'
EXEC_LIST = { EXEC_LIST = {
'topic_1': { 'topic_1': {
'key': 'key', # Give a key or None to compare plain DATA 'key': 'key', # Give a key or None to compare plain DATA

21
exec_command.py
View File

@ -24,12 +24,24 @@ bell_log.addHandler(my_handler)
class exec_command(mqtt.mqtt_client): class exec_command(mqtt.mqtt_client):
def __init__(self): def __init__(self):
self.__block_execution__ = False self.__enabled__ = True
mqtt.mqtt_client.__init__(self, config.APP_NAME, config.MQTT_SERVER, 1883, config.MQTT_USER, config.MQTT_PASS) mqtt.mqtt_client.__init__(self, config.APP_NAME, config.MQTT_SERVER, 1883, config.MQTT_USER, config.MQTT_PASS)
self.add_callback(config.ENABLED_TOPIC + '/set', self.set_enabled)
for topic in config.EXEC_LIST: for topic in config.EXEC_LIST:
self.add_callback(topic, self.mqtt_rx) self.add_callback(topic, self.mqtt_rx)
# Start a pseudo process # Start a pseudo process
self.process = subprocess.Popen(["sleep", "0"]) self.process = subprocess.Popen(["sleep", "0"])
self.publish_states()
def set_enabled(self, client, userdata, message):
try:
payload = json.loads(message.payload)
except:
logger.exception("Error decoding json mqtt message")
else:
if self.__enabled__ != payload:
self.__enabled__ = payload
self.publish_states()
def exec_command(self, cmd, message): def exec_command(self, cmd, message):
self.process = subprocess.Popen(cmd.split(" ")) self.process = subprocess.Popen(cmd.split(" "))
@ -56,10 +68,16 @@ class exec_command(mqtt.mqtt_client):
except AttributeError: except AttributeError:
logger.exception("payload seems to be no dictionary") logger.exception("payload seems to be no dictionary")
if data is None or payload == data: if data is None or payload == data:
if self.__enabled__:
if self.process.poll() is None: if self.process.poll() is None:
self.process.kill() self.process.kill()
logger.debug("Starting execution in background...") logger.debug("Starting execution in background...")
self.exec_command(config.EXEC_LIST[message.topic]['command'], message) self.exec_command(config.EXEC_LIST[message.topic]['command'], message)
else:
logger.info("Execution is disabled")
def publish_states(self):
self.send(config.ENABLED_TOPIC, json.dumps(self.__enabled__))
if __name__ == '__main__': if __name__ == '__main__':
@ -69,6 +87,7 @@ if __name__ == '__main__':
# #
while True: while True:
time.sleep(30) time.sleep(30)
ec.publish_states()
try: try:
ec.join() ec.join()
finally: finally: