h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor: rework status fetching to make it more readable

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-05-04 00:20:53 +02:00
parent 27455dfc64
commit 750bf1caaf
3 changed files with 58 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kiauh/components/webui_client/client_utils.py
View File

@@ -35,13 +35,18 @@ from utils.git_utils import (
from utils.logger import Logger from utils.logger import Logger
def get_client_status(client: BaseWebClient) -> str: def get_client_status(
return get_install_status_webui( client: BaseWebClient, fetch_remote: bool = False
) -> Dict[Literal["status", "local", "remote"], str]:
status = get_install_status_webui(
client.client_dir, client.client_dir,
NGINX_SITES_AVAILABLE.joinpath(client.name), NGINX_SITES_AVAILABLE.joinpath(client.name),
NGINX_CONFD.joinpath("upstreams.conf"), NGINX_CONFD.joinpath("upstreams.conf"),
NGINX_CONFD.joinpath("common_vars.conf"), NGINX_CONFD.joinpath("common_vars.conf"),
) )
local = get_local_client_version(client)
remote = get_remote_client_version(client) if fetch_remote else None
return {"status": status, "local": local, "remote": remote}
def get_client_config_status( def get_client_config_status(

48
kiauh/core/menus/main_menu.py
View File

@@ -49,16 +49,9 @@ class MainMenu(BaseMenu):
self.header = True self.header = True
self.footer_type = FooterType.QUIT self.footer_type = FooterType.QUIT
self.kl_status = "" self.kl_status = self.kl_repo = self.mr_status = self.mr_repo = ""
self.kl_repo = "" self.ms_status = self.fl_status = self.ks_status = self.mb_status = ""
self.mr_status = "" self.cn_status = self.cc_status = ""
self.mr_repo = ""
self.ms_status = ""
self.fl_status = ""
self.ks_status = ""
self.mb_status = ""
self.cn_status = ""
self.cc_status = ""
self.init_status() self.init_status()
def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None: def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
@@ -87,18 +80,19 @@ class MainMenu(BaseMenu):
) )
def fetch_status(self) -> None: def fetch_status(self) -> None:
self._update_status("kl", get_klipper_status) self._get_component_status("kl", get_klipper_status)
self._update_status("mr", get_moonraker_status) self._get_component_status("mr", get_moonraker_status)
self.ms_status = get_client_status(MainsailData()) self._get_component_status("ms", get_client_status, MainsailData())
self.fl_status = get_client_status(FluiddData()) self._get_component_status("fl", get_client_status, FluiddData())
self.cc_status = get_current_client_config([MainsailData(), FluiddData()]) self.cc_status = get_current_client_config([MainsailData(), FluiddData()])
self._update_status("ks", get_klipperscreen_status) self._get_component_status("ks", get_klipperscreen_status)
self._update_status("cn", get_crowsnest_status) self._get_component_status("cn", get_crowsnest_status)
def _update_status(self, status_name: str, status_fn: callable) -> None: def _get_component_status(self, name: str, status_fn: callable, *args) -> None:
status_data = status_fn() status_data = status_fn(*args)
status = status_data.get("status") status = status_data.get("status")
code = status_data.get("status_code") code = status_data.get("status_code")
repo = status_data.get("repo")
instance_count = status_data.get("instances") instance_count = status_data.get("instances")
@@ -106,18 +100,10 @@ class MainMenu(BaseMenu):
if instance_count and code == 1: if instance_count and code == 1:
count = f" {instance_count}" count = f" {instance_count}"
setattr( setattr(self, f"{name}_status", self._format_by_code(code, status, count))
self, setattr(self, f"{name}_repo", f"{COLOR_CYAN}{repo}{RESET_FORMAT}")
f"{status_name}_status",
self._format_status_by_code(code, status, count),
)
setattr(
self,
f"{status_name}_repo",
f"{COLOR_CYAN}{status_data.get('repo')}{RESET_FORMAT}",
)
def _format_status_by_code(self, code: int, status: str, count: str) -> str: def _format_by_code(self, code: int, status: str, count: str) -> str:
if code == 1: if code == 1:
return f"{COLOR_GREEN}{status}{count}{RESET_FORMAT}" return f"{COLOR_GREEN}{status}{count}{RESET_FORMAT}"
elif code == 2: elif code == 2:
@@ -144,8 +130,8 @@ class MainMenu(BaseMenu):
| 2) [Update] | Moonraker: {self.mr_status:<32} | | 2) [Update] | Moonraker: {self.mr_status:<32} |
| 3) [Remove] | Repo: {self.mr_repo:<32} | | 3) [Remove] | Repo: {self.mr_repo:<32} |
| 4) [Advanced] |------------------------------------| | 4) [Advanced] |------------------------------------|
| 5) [Backup] | Mainsail: {self.ms_status:<26} | | 5) [Backup] | Mainsail: {self.ms_status:<35} |
| | Fluidd: {self.fl_status:<26} | | | Fluidd: {self.fl_status:<35} |
| S) [Settings] | Client-Config: {self.cc_status:<26} | | S) [Settings] | Client-Config: {self.cc_status:<26} |
| | | | | |
| Community: | KlipperScreen: {self.ks_status:<26} | | Community: | KlipperScreen: {self.ks_status:<26} |

117
kiauh/core/menus/update_menu.py
View File

@@ -30,9 +30,8 @@ from components.webui_client.client_config.client_config_setup import (
) )
from components.webui_client.client_setup import update_client from components.webui_client.client_setup import update_client
from components.webui_client.client_utils import ( from components.webui_client.client_utils import (
get_local_client_version,
get_remote_client_version,
get_client_config_status, get_client_config_status,
get_client_status,
) )
from components.webui_client.fluidd_data import FluiddData from components.webui_client.fluidd_data import FluiddData
from components.webui_client.mainsail_data import MainsailData from components.webui_client.mainsail_data import MainsailData
@@ -42,7 +41,6 @@ from utils.constants import (
COLOR_GREEN, COLOR_GREEN,
RESET_FORMAT, RESET_FORMAT,
COLOR_YELLOW, COLOR_YELLOW,
COLOR_WHITE,
COLOR_RED, COLOR_RED,
) )
@@ -54,27 +52,15 @@ class UpdateMenu(BaseMenu):
super().__init__() super().__init__()
self.previous_menu = previous_menu self.previous_menu = previous_menu
self.kl_local = f"{COLOR_WHITE}{RESET_FORMAT}" self.kl_local = self.kl_remote = self.mr_local = self.mr_remote = ""
self.kl_remote = f"{COLOR_WHITE}{RESET_FORMAT}" self.ms_local = self.ms_remote = self.fl_local = self.fl_remote = ""
self.mr_local = f"{COLOR_WHITE}{RESET_FORMAT}" self.mc_local = self.mc_remote = self.fc_local = self.fc_remote = ""
self.mr_remote = f"{COLOR_WHITE}{RESET_FORMAT}" self.ks_local = self.ks_remote = self.mb_local = self.mb_remote = ""
self.ms_local = f"{COLOR_WHITE}{RESET_FORMAT}" self.cn_local = self.cn_remote = ""
self.ms_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.fl_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.fl_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.mc_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.mc_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.fc_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.fc_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.ks_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.ks_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.mb_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.mb_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.cn_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.cn_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.mainsail_client = MainsailData() self.mainsail_data = MainsailData()
self.fluidd_client = FluiddData() self.fluidd_data = FluiddData()
self._fetch_update_status()
def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None: def set_previous_menu(self, previous_menu: Optional[Type[BaseMenu]]) -> None:
from core.menus.main_menu import MainMenu from core.menus.main_menu import MainMenu
@@ -99,7 +85,7 @@ class UpdateMenu(BaseMenu):
} }
def print_menu(self): def print_menu(self):
self.fetch_update_status() self._fetch_update_status()
header = " [ Update Menu ] " header = " [ Update Menu ] "
color = COLOR_GREEN color = COLOR_GREEN
@@ -143,16 +129,16 @@ class UpdateMenu(BaseMenu):
update_moonraker() update_moonraker()
def update_mainsail(self, **kwargs): def update_mainsail(self, **kwargs):
update_client(self.mainsail_client) update_client(self.mainsail_data)
def update_mainsail_config(self, **kwargs): def update_mainsail_config(self, **kwargs):
update_client_config(self.mainsail_client) update_client_config(self.mainsail_data)
def update_fluidd(self, **kwargs): def update_fluidd(self, **kwargs):
update_client(self.fluidd_client) update_client(self.fluidd_data)
def update_fluidd_config(self, **kwargs): def update_fluidd_config(self, **kwargs):
update_client_config(self.fluidd_client) update_client_config(self.fluidd_data)
def update_klipperscreen(self, **kwargs): def update_klipperscreen(self, **kwargs):
update_klipperscreen() update_klipperscreen()
@@ -165,70 +151,35 @@ class UpdateMenu(BaseMenu):
def upgrade_system_packages(self, **kwargs): ... def upgrade_system_packages(self, **kwargs): ...
def fetch_update_status(self): def _fetch_update_status(self):
# klipper # klipper
kl_status = get_klipper_status() self._get_update_status("kl", get_klipper_status)
self.kl_local = self.format_local_status(
kl_status.get("local"), kl_status.get("remote")
)
self.kl_remote = kl_status.get("remote")
self.kl_remote = f"{COLOR_GREEN}{kl_status.get('remote')}{RESET_FORMAT}"
# moonraker # moonraker
mr_status = get_moonraker_status() self._get_update_status("mr", get_moonraker_status)
self.mr_local = self.format_local_status(
mr_status.get("local"), mr_status.get("remote")
)
self.mr_remote = f"{COLOR_GREEN}{mr_status.get('remote')}{RESET_FORMAT}"
# mainsail # mainsail
ms_local_ver = get_local_client_version(self.mainsail_client) self._get_update_status("ms", get_client_status, self.mainsail_data, True)
ms_remote_ver = get_remote_client_version(self.mainsail_client)
self.ms_local = self.format_local_status(ms_local_ver, ms_remote_ver)
self.ms_remote = f"{COLOR_GREEN if ms_remote_ver != 'ERROR' else COLOR_RED}{ms_remote_ver}{RESET_FORMAT}"
# fluidd
fl_local_ver = get_local_client_version(self.fluidd_client)
fl_remote_ver = get_remote_client_version(self.fluidd_client)
self.fl_local = self.format_local_status(fl_local_ver, fl_remote_ver)
self.fl_remote = f"{COLOR_GREEN if fl_remote_ver != 'ERROR' else COLOR_RED}{fl_remote_ver}{RESET_FORMAT}"
# mainsail-config # mainsail-config
mc_status = get_client_config_status(self.mainsail_client) self._get_update_status("mc", get_client_config_status, self.mainsail_data)
self.mc_local = self.format_local_status( # fluidd
mc_status.get("local"), mc_status.get("remote") self._get_update_status("fl", get_client_status, self.fluidd_data, True)
)
self.mc_remote = f"{COLOR_GREEN}{mc_status.get('remote')}{RESET_FORMAT}"
# fluidd-config # fluidd-config
fc_status = get_client_config_status(self.fluidd_client) self._get_update_status("fc", get_client_config_status, self.fluidd_data)
self.fc_local = self.format_local_status(
fc_status.get("local"), fc_status.get("remote")
)
self.fc_remote = f"{COLOR_GREEN}{fc_status.get('remote')}{RESET_FORMAT}"
# klipperscreen # klipperscreen
ks_status = get_klipperscreen_status() self._get_update_status("ks", get_klipperscreen_status)
self.ks_local = self.format_local_status(
ks_status.get("local"), ks_status.get("remote")
)
self.ks_remote = f"{COLOR_GREEN}{ks_status.get('remote')}{RESET_FORMAT}"
# mobileraker # mobileraker
mb_status = get_mobileraker_status() self._get_update_status("mb", get_mobileraker_status)
self.mb_local = self.format_local_status(
mb_status.get("local"), mb_status.get("remote")
)
self.mb_remote = f"{COLOR_GREEN}{mb_status.get('remote')}{RESET_FORMAT}"
# crowsnest # crowsnest
cn_status = get_crowsnest_status() self._get_update_status("cn", get_crowsnest_status)
self.cn_local = self.format_local_status(
cn_status.get("local"), cn_status.get("remote")
)
self.cn_remote = f"{COLOR_GREEN}{cn_status.get('remote')}{RESET_FORMAT}"
def format_local_status(self, local_version, remote_version) -> str: def _format_local_status(self, local_version, remote_version) -> str:
if local_version == remote_version: if local_version == remote_version:
return f"{COLOR_GREEN}{local_version}{RESET_FORMAT}" return f"{COLOR_GREEN}{local_version}{RESET_FORMAT}"
return f"{COLOR_YELLOW}{local_version}{RESET_FORMAT}" return f"{COLOR_YELLOW}{local_version}{RESET_FORMAT}"
def _get_update_status(self, name: str, status_fn: callable, *args) -> None:
status_data = status_fn(*args)
local_ver = status_data.get("local")
remote_ver = status_data.get("remote")
color = COLOR_GREEN if remote_ver != "ERROR" else COLOR_RED
setattr(self, f"{name}_local", self._format_local_status(local_ver, remote_ver))
setattr(self, f"{name}_remote", f"{color}{remote_ver}{RESET_FORMAT}")