Refactor environment variables into constants module

This commit is contained in:
Edward Brown 2023-09-01 20:21:22 +01:00
parent c6cb067ddc
commit 84bc8ca878
4 changed files with 18 additions and 14 deletions

View file

@ -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')

View file

@ -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:

View file

@ -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"

View file

@ -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__)