sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-06 21:32:21 +01:00
Code Issues Releases Wiki Activity

Add support for command-line substitutions (#1014)

Browse Source 
* Add support for command-line substitutions

* Fix flake8

* pylint fixes
This commit is contained in:
Alex Mekkering
2020-06-21 20:33:01 +02:00
committed by GitHub
parent f9a8629157
commit ecb1c77f8b
4 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
esphome/config.py
View File

@@ -387,15 +387,15 @@ def recursive_check_replaceme(value):
return value
def validate_config(config):
def validate_config(config, command_line_substitutions):
result = Config()
# 1. Load substitutions
if CONF_SUBSTITUTIONS in config:
result[CONF_SUBSTITUTIONS] = config[CONF_SUBSTITUTIONS]
result[CONF_SUBSTITUTIONS] = {**config[CONF_SUBSTITUTIONS], **command_line_substitutions}
result.add_output_path([CONF_SUBSTITUTIONS], CONF_SUBSTITUTIONS)
try:
substitutions.do_substitution_pass(config)
substitutions.do_substitution_pass(config, command_line_substitutions)
except vol.Invalid as err:
result.add_error(err)
return result
@@ -656,7 +656,7 @@ class InvalidYAMLError(EsphomeError):
self.base_exc = base_exc
def _load_config():
def _load_config(command_line_substitutions):
try:
config = yaml_util.load_yaml(CORE.config_path)
except EsphomeError as e:
@@ -664,7 +664,7 @@ def _load_config():
CORE.raw_config = config
try:
result = validate_config(config)
result = validate_config(config, command_line_substitutions)
except EsphomeError:
raise
except Exception:
@@ -674,9 +674,9 @@ def _load_config():
return result
def load_config():
def load_config(command_line_substitutions):
try:
return _load_config()
return _load_config(command_line_substitutions)
except vol.Invalid as err:
raise EsphomeError(f"Error while parsing config: {err}")
@@ -813,10 +813,10 @@ def strip_default_ids(config):
return config
def read_config():
def read_config(command_line_substitutions):
_LOGGER.info("Reading configuration %s...", CORE.config_path)
try:
res = load_config()
res = load_config(command_line_substitutions)
except EsphomeError as err:
_LOGGER.error("Error while reading config: %s", err)
return None