From 03892a517ecaa4406c500c76ab0139025a158793 Mon Sep 17 00:00:00 2001 From: Arksine Date: Wed, 26 May 2021 11:27:02 -0400 Subject: [PATCH] update_manger: move module into its own package This includes its specific configuration file. Signed-off-by: Eric Callahan --- moonraker/components/update_manager/__init__.py | 15 +++++++++++++++ .../update_manager}/update_manager.conf | 0 .../{ => update_manager}/update_manager.py | 6 +++--- 3 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 moonraker/components/update_manager/__init__.py rename {scripts => moonraker/components/update_manager}/update_manager.conf (100%) rename moonraker/components/{ => update_manager}/update_manager.py (99%) diff --git a/moonraker/components/update_manager/__init__.py b/moonraker/components/update_manager/__init__.py new file mode 100644 index 0000000..f322adc --- /dev/null +++ b/moonraker/components/update_manager/__init__.py @@ -0,0 +1,15 @@ +# Package definition for the update_manager +# +# Copyright (C) 2021 Eric Callahan +# +# This file may be distributed under the terms of the GNU GPLv3 license. + +from __future__ import annotations +from . import update_manager as um + +from typing import TYPE_CHECKING +if TYPE_CHECKING: + from confighelper import ConfigHelper + +def load_component(config: ConfigHelper) -> um.UpdateManager: + return um.load_component(config) diff --git a/scripts/update_manager.conf b/moonraker/components/update_manager/update_manager.conf similarity index 100% rename from scripts/update_manager.conf rename to moonraker/components/update_manager/update_manager.conf diff --git a/moonraker/components/update_manager.py b/moonraker/components/update_manager/update_manager.py similarity index 99% rename from moonraker/components/update_manager.py rename to moonraker/components/update_manager/update_manager.py index 5c58c2e..8904d73 100644 --- a/moonraker/components/update_manager.py +++ b/moonraker/components/update_manager/update_manager.py @@ -39,9 +39,9 @@ if TYPE_CHECKING: from confighelper import ConfigHelper from websockets import WebRequest from utils import ServerError - from . import klippy_apis - from . import shell_command - from . import database + from components import klippy_apis + from components import shell_command + from components import database APIComp = klippy_apis.KlippyAPI SCMDComp = shell_command.ShellCommandFactory DBComp = database.MoonrakerDatabase