jeka/kiauh
1
0
Fork 0
mirror of https://github.com/dw-0/kiauh.git synced 2026-03-24 11:28:37 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace RepositoryManager by simple util functions

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-05-01 14:05:46 +02:00
parent 3da7aedd7f
commit 7d3d46ac07
11 changed files with 169 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kiauh/components/moonraker/moonraker_setup.py
View File

@@ -35,8 +35,8 @@ from components.moonraker.moonraker_utils import (
backup_moonraker_dir,
)
from core.instance_manager.instance_manager import InstanceManager
from core.repo_manager.repo_manager import RepoManager
from utils.filesystem_utils import check_file_exist
from utils.git_utils import git_clone_wrapper, git_pull_wrapper
from utils.input_utils import (
get_confirm,
get_selection_input,
@@ -135,12 +135,7 @@ def setup_moonraker_prerequesites() -> None:
repo = settings.get("moonraker", "repo_url")
branch = settings.get("moonraker", "branch")
repo_manager = RepoManager(
repo=repo,
branch=branch,
target_dir=MOONRAKER_DIR,
)
repo_manager.clone_repo()
git_clone_wrapper(repo, branch, MOONRAKER_DIR)
# install moonraker dependencies and create python virtualenv
install_moonraker_packages(MOONRAKER_DIR)
@@ -196,12 +191,9 @@ def update_moonraker() -> None:
instance_manager = InstanceManager(Moonraker)
instance_manager.stop_all_instance()
repo_manager = RepoManager(
repo=settings.get("moonraker", "repo_url"),
branch=settings.get("moonraker", "branch"),
target_dir=MOONRAKER_DIR,
git_pull_wrapper(
repo=settings.get("moonraker", "repo_url"), target_dir=MOONRAKER_DIR
)
repo_manager.pull_repo()
# install possible new system packages
install_moonraker_packages(MOONRAKER_DIR)

8
kiauh/components/moonraker/moonraker_utils.py
View File

@@ -25,8 +25,8 @@ from components.webui_client.mainsail_data import MainsailData
from core.backup_manager.backup_manager import BackupManager
from core.config_manager.config_manager import ConfigManager
from core.instance_manager.instance_manager import InstanceManager
from core.repo_manager.repo_manager import RepoManager
from utils.common import get_install_status_common
from utils.git_utils import get_repo_name, get_local_commit, get_remote_commit
from utils.logger import Logger
from utils.system_utils import (
get_ipv4_addr,
@@ -44,9 +44,9 @@ def get_moonraker_status() -> (
"status": status.get("status"),
"status_code": status.get("status_code"),
"instances": status.get("instances"),
"repo": RepoManager.get_repo_name(MOONRAKER_DIR),
"local": RepoManager.get_local_commit(MOONRAKER_DIR),
"remote": RepoManager.get_remote_commit(MOONRAKER_DIR),
"repo": get_repo_name(MOONRAKER_DIR),
"local": get_local_commit(MOONRAKER_DIR),
"remote": get_remote_commit(MOONRAKER_DIR),
}