diff --git a/haco/constants.py b/haco/constants.py index bac17ee..bc588f7 100644 --- a/haco/constants.py +++ b/haco/constants.py @@ -1,5 +1,19 @@ +import os import string +from pathlib import Path CHARS_ALLOWED = string.ascii_lowercase + string.digits SEPS_ALLOWED = '_- ' BRANCH = 'release' + +CONFIGS_PATH = Path(os.environ['HACO_CONFIGS_PATH']) +OPTIONS_PATH = Path(os.environ['HACO_OPTIONS_PATH']) +MQTT_PASSWORD = os.environ['MQTT_PASSWORD'] +MQTT_HOST = os.environ['MQTT_HOST'] +MQTT_PORT = int(os.environ['MQTT_PORT']) +MQTT_USERNAME = os.environ['MQTT_USERNAME'] + +if (CONFIGS_PATH / '.debug').exists(): + LOG_LEVEL = 'DEBUG' +else: + LOG_LEVEL = os.environ.get('HACO_LOG_LEVEL', 'INFO') diff --git a/haco/load_configs.py b/haco/load_configs.py index 9d93d77..c49967b 100644 --- a/haco/load_configs.py +++ b/haco/load_configs.py @@ -2,16 +2,13 @@ from importlib import reload import importlib.util import json -import os from pathlib import Path from haco import tools +from haco.constants import CONFIGS_PATH, OPTIONS_PATH from haco.control import Control from haco.device import Device -CONFIGS_PATH = Path(os.environ['HACO_CONFIGS_PATH']) -OPTIONS_PATH = Path(os.environ['HACO_OPTIONS_PATH']) - def load_json(file_path): with open(file_path, 'r') as json_file: diff --git a/haco/mqtt.py b/haco/mqtt.py index 851a109..8cd230c 100644 --- a/haco/mqtt.py +++ b/haco/mqtt.py @@ -1,19 +1,14 @@ import aiomqtt import asyncio import json -import os from pathlib import Path from haco import constants, tools +from haco.constants import MQTT_PASSWORD, MQTT_HOST, MQTT_PORT, MQTT_USERNAME from haco.device import Device from haco.load_configs import load_devices from haco.tools import log_received -MQTT_PASSWORD = os.environ['MQTT_PASSWORD'] -MQTT_HOST = os.environ['MQTT_HOST'] -MQTT_PORT = int(os.environ['MQTT_PORT']) -MQTT_USERNAME = os.environ['MQTT_USERNAME'] - async def listen(client, devices): TOPIC_ANNOUNCE = f"haco/{constants.BRANCH}/+/announce" diff --git a/haco/tools.py b/haco/tools.py index c24d237..6d9e9fe 100644 --- a/haco/tools.py +++ b/haco/tools.py @@ -1,13 +1,11 @@ import hashlib import logging -import os from haco import constants, tuya from haco.tasmota import Tasmota -LOG_LEVEL = os.environ.get('HACO_LOG_LEVEL', 'INFO') - -logging.basicConfig(level=LOG_LEVEL, format='%(asctime)s %(levelname)-8s %(message)s', datefmt='%Y-%m-%d %H:%M:%S') +logging.basicConfig(level=constants.LOG_LEVEL, format='%(asctime)s %(levelname)-8s %(message)s', + datefmt='%Y-%m-%d %H:%M:%S') logger = logging.getLogger(__name__)