From 864ffee37751cc4e66aeff59debbe52ce4ee274c Mon Sep 17 00:00:00 2001 From: Erik Date: Wed, 3 Apr 2024 08:30:49 +0200 Subject: [PATCH 1/2] Add HacsBase.__init__ --- custom_components/hacs/base.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/custom_components/hacs/base.py b/custom_components/hacs/base.py index 76c7785cd20..5d5c172e728 100644 --- a/custom_components/hacs/base.py +++ b/custom_components/hacs/base.py @@ -355,9 +355,6 @@ def removed_repository(self, repository_full_name: str) -> RemovedRepository: class HacsBase: """Base HACS class.""" - common = HacsCommon() - configuration = HacsConfiguration() - core = HacsCore() data: HacsData | None = None data_client: HacsDataClient | None = None frontend_version: str | None = None @@ -365,18 +362,24 @@ class HacsBase: githubapi: GitHubAPI | None = None hass: HomeAssistant | None = None integration: Integration | None = None - log: logging.Logger = LOGGER queue: QueueManager | None = None - recuring_tasks = [] - repositories: HacsRepositories = HacsRepositories() repository: AIOGitHubAPIRepository | None = None session: ClientSession | None = None stage: HacsStage | None = None - status = HacsStatus() - system = HacsSystem() validation: ValidationManager | None = None version: AwesomeVersion | None = None + def __init__(self) -> None: + """Initialize.""" + self.common = HacsCommon() + self.configuration = HacsConfiguration() + self.core = HacsCore() + self.log = LOGGER + self.recuring_tasks = [] + self.repositories: HacsRepositories = HacsRepositories() + self.status = HacsStatus() + self.system = HacsSystem() + @property def integration_dir(self) -> pathlib.Path: """Return the HACS integration dir.""" From b678b5e07634a78926a2d439ad3ad8bcc5c94d9b Mon Sep 17 00:00:00 2001 From: Erik Date: Tue, 9 Apr 2024 15:26:59 +0200 Subject: [PATCH 2/2] Address review comments --- custom_components/hacs/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/custom_components/hacs/base.py b/custom_components/hacs/base.py index 5d5c172e728..fff0ef89644 100644 --- a/custom_components/hacs/base.py +++ b/custom_components/hacs/base.py @@ -375,8 +375,8 @@ def __init__(self) -> None: self.configuration = HacsConfiguration() self.core = HacsCore() self.log = LOGGER - self.recuring_tasks = [] - self.repositories: HacsRepositories = HacsRepositories() + self.recuring_tasks: list[Callable[[], None]] = [] + self.repositories = HacsRepositories() self.status = HacsStatus() self.system = HacsSystem()