Skip to content

Commit

Permalink
Merge branch 'pydantic-hass' of https://github.com/AppDaemon/appdaemon
Browse files Browse the repository at this point in the history
…into pydantic-hass
  • Loading branch information
acockburn committed Feb 7, 2025
2 parents b299e39 + 0aff2b1 commit 11e5481
Show file tree
Hide file tree
Showing 11 changed files with 510 additions and 144 deletions.
13 changes: 11 additions & 2 deletions appdaemon/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,12 @@ def run(self, ad_config_model: AppDaemonConfig, hadashboard, admin, aui, api, ht

# Initialize Dashboard/API/admin

if http is not None and (hadashboard is not None or admin is not None or aui is not None or api is not False):
if http is not None and (
hadashboard is not None or
admin is not None or
aui is not None or
api is not False
):
self.logger.info("Initializing HTTP")
self.http_object = HTTP(
self.AD,
Expand Down Expand Up @@ -253,7 +258,11 @@ def main(self): # noqa: C901
pidfile = args.pidfile

default_config_files = ["appdaemon.yaml", "appdaemon.toml"]
default_config_paths = [Path("~/.homeassistant").expanduser(), Path("/etc/appdaemon"), Path("/conf")]
default_config_paths = [
Path("~/.homeassistant").expanduser(),
Path("/etc/appdaemon"),
Path("/conf")
]

if args.configfile is not None:
config_file = Path(args.configfile).resolve()
Expand Down
Loading

0 comments on commit 11e5481

Please sign in to comment.