h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-01-23 14:44:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve extraction of env variables

Browse Source
This commit is contained in:
Stephan Leuschner
2023-11-19 12:37:21 -05:00
parent 431a93a7ff
commit 2ba9eae7e6
2 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/libs/home_assistant.py
View File

@@ -4,7 +4,7 @@ import logging
import json import json
from threading import Thread from threading import Thread
import time import time
import environ import os
home_assistant_url = "" home_assistant_url = ""
home_assistant_token = "" home_assistant_token = ""

16
nspanel-lovelace-ui/rootfs/usr/bin/mqtt-manager/main.py
View File

@@ -10,7 +10,6 @@ import yaml
from uuid import getnode as get_mac from uuid import getnode as get_mac
from panel import LovelaceUIPanel from panel import LovelaceUIPanel
import os import os
import environ
settings = {} settings = {}
panels = {} panels = {}
@@ -69,20 +68,19 @@ def get_config():
with open(CONFIG_FILE, 'r', encoding="utf8") as file: with open(CONFIG_FILE, 'r', encoding="utf8") as file:
settings = yaml.safe_load(file) settings = yaml.safe_load(file)
environment = environ.Env()
if not settings.get("mqtt_username"): if not settings.get("mqtt_username"):
settings["mqtt_username"] = environment('MQTT_USER') settings["mqtt_username"] = os.getenv('MQTT_USER')
if not settings.get("mqtt_password"): if not settings.get("mqtt_password"):
settings["mqtt_password"] = environment('MQTT_PASS') settings["mqtt_password"] = os.getenv('MQTT_PASS')
if not settings.get("mqtt_port"): if not settings.get("mqtt_port"):
settings["mqtt_port"] = environment('MQTT_PORT') settings["mqtt_port"] = os.getenv('MQTT_PORT')
if not settings.get("mqtt_server"): if not settings.get("mqtt_server"):
settings["mqtt_server"] = environment('MQTT_SERVER') settings["mqtt_server"] = os.getenv('MQTT_SERVER')
st = os.getenv('SUPERVISOR_TOKEN')
settings["is_addon"] = False settings["is_addon"] = False
if "SUPERVISOR_TOKEN" in environment: if st is not None:
settings["home_assistant_token"] = environment('SUPERVISOR_TOKEN') settings["home_assistant_token"] = st
print(settings["home_assistant_token"]) print(settings["home_assistant_token"])
settings["home_assistant_address"] = "http://supervisor" settings["home_assistant_address"] = "http://supervisor"
settings["is_addon"] = True settings["is_addon"] = True