Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added logic to main that prefers .yaml-config over .conf

pull/40/head
theolind 2015-02-28 17:42:23 +01:00
parent 223d2c2c3f
commit f2b602c7ec
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
homeassistant/__main__.py
View File

@ -72,15 +72,19 @@ def ensure_config_path(config_dir):
'directory {} ').format(config_dir)) 'directory {} ').format(config_dir))
sys.exit() sys.exit()
# Try to use yaml configuration first
config_path = os.path.join(config_dir, 'configuration.yaml')
if not os.path.isfile(config_path):
config_path = os.path.join(config_dir, 'home-assistant.conf') config_path = os.path.join(config_dir, 'home-assistant.conf')
# Ensure a config file exists to make first time usage easier # Ensure a config file exists to make first time usage easier
if not os.path.isfile(config_path): if not os.path.isfile(config_path):
config_path = os.path.join(config_dir, 'configuration.yaml')
try: try:
with open(config_path, 'w') as conf: with open(config_path, 'w') as conf:
conf.write("[frontend]\n\n") conf.write("frontend:\n\n")
conf.write("[discovery]\n\n") conf.write("discovery:\n\n")
conf.write("[history]\n\n") conf.write("history:\n\n")
except IOError: except IOError:
print(('Fatal Error: No configuration file found and unable ' print(('Fatal Error: No configuration file found and unable '
'to write a default one to {}').format(config_path)) 'to write a default one to {}').format(config_path))

1
homeassistant/bootstrap.py
View File

@ -112,6 +112,7 @@ def from_config_file(config_path, hass=None):
# Set config dir to directory holding config file # Set config dir to directory holding config file
hass.config_dir = os.path.abspath(os.path.dirname(config_path)) hass.config_dir = os.path.abspath(os.path.dirname(config_path))
config_dict = {}
# check config file type # check config file type
if(os.path.splitext(config_path)[1] == '.yaml'): if(os.path.splitext(config_path)[1] == '.yaml'):
# Read yaml # Read yaml