Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

web_server options_json bug in standalone fix #226

Merged
merged 4 commits into from
Mar 11, 2024
Merged

web_server options_json bug in standalone fix #226

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
85a8331
web_server options_json bug in standalone fix
GeoDerp Mar 10, 2024
31a1b5f
web_server options env refined
GeoDerp Mar 10, 2024
afe12c0
web_server, refined env order
GeoDerp Mar 11, 2024
7c7afee
web_server slight neaten
GeoDerp Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions src/emhass/web_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,8 +203,6 @@ def action_call(action_name):
parser.add_argument('--no_response', type=strtobool, default='False', help='This is set if json response errors occur')
args = parser.parse_args()

use_options = os.getenv('USE_OPTIONS', default=False)

#Obtain url and key from ENV or ARG (if any)
hass_url = os.getenv("EMHASS_URL", default=args.url)
key = os.getenv("SUPERVISOR_TOKEN", default=args.key)
Expand All @@ -214,33 +212,40 @@ def action_call(action_name):
if key is None: key = ""
if hass_url is None: hass_url = ""

#find env's, not not set defaults
use_options = os.getenv('USE_OPTIONS', default=False)
CONFIG_PATH = os.getenv("CONFIG_PATH", default="/app/config_emhass.yaml")
OPTIONS_PATH = os.getenv('OPTIONS_PATH', default="/app/options.json")
DATA_PATH = os.getenv("DATA_PATH", default="/app/data/")

#options None by default
options = None

# Define the paths
if args.addon==1:
OPTIONS_PATH = os.getenv('OPTIONS_PATH', default="/app/options.json")
options_json = Path(OPTIONS_PATH)
CONFIG_PATH = os.getenv("CONFIG_PATH", default="/app/config_emhass.yaml")
DATA_PATH = os.getenv("DATA_PATH", default="/app/data/")
# Read options info
if options_json.exists():
with options_json.open('r') as data:
options = json.load(data)
else:
app.logger.error("options.json does not exists")
app.logger.error("options.json does not exist")
raise Exception("options.json does not exist in path: "+str(options_json))
else:
if use_options:
OPTIONS_PATH = os.getenv('OPTIONS_PATH', default="/app/options.json")
options_json = Path(OPTIONS_PATH)
# Read options info
if options_json.exists():
with options_json.open('r') as data:
options = json.load(data)
else:
app.logger.error("options.json does not exists")
app.logger.error("options.json does not exist")
raise Exception("options.json does not exist in path: "+str(options_json))
else:
options = None

#if data path specified by options.json
if options_json.exists():
if options is not None:
if options.get('data_path', None) != None and options.get('data_path', None) != "default":
DATA_PATH = options.get('data_path', None);

Expand Down
Loading