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

feat(Fluidd): add Fluidd

Browse Source 
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
dw-0
2024-02-24 15:26:32 +01:00
parent 2a4fcf3a3a
commit 384503c4f5
15 changed files with 828 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kiauh/core/menus/install_menu.py
View File

@@ -75,7 +75,7 @@ class InstallMenu(BaseMenu):
mainsail_setup.install_mainsail()
def install_fluidd(self, **kwargs):
print("install_fluidd")
fluidd_setup.install_fluidd()
def install_klipperscreen(self, **kwargs):
print("install_klipperscreen")

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

@@ -11,20 +11,21 @@
import textwrap
from kiauh.components.klipper.klipper_utils import get_klipper_status
from kiauh.components.log_uploads.menus.log_upload_menu import LogUploadMenu
from kiauh.components.mainsail.mainsail_utils import get_mainsail_status
from kiauh.components.moonraker.moonraker_utils import get_moonraker_status
from kiauh.core.menus import QUIT_FOOTER
from kiauh.core.menus.advanced_menu import AdvancedMenu
from kiauh.core.menus.backup_menu import BackupMenu
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.core.menus.extensions_menu import ExtensionsMenu
from kiauh.core.menus.install_menu import InstallMenu
from kiauh.core.menus.remove_menu import RemoveMenu
from kiauh.core.menus.settings_menu import SettingsMenu
from kiauh.core.menus.update_menu import UpdateMenu
from kiauh.utils.constants import (
from components.fluidd.fluidd_utils import get_fluidd_status
from components.klipper.klipper_utils import get_klipper_status
from components.log_uploads.menus.log_upload_menu import LogUploadMenu
from components.mainsail.mainsail_utils import get_mainsail_status
from components.moonraker.moonraker_utils import get_moonraker_status
from core.menus import QUIT_FOOTER
from core.menus.advanced_menu import AdvancedMenu
from core.menus.backup_menu import BackupMenu
from core.menus.base_menu import BaseMenu
from core.menus.extensions_menu import ExtensionsMenu
from core.menus.install_menu import InstallMenu
from core.menus.remove_menu import RemoveMenu
from core.menus.settings_menu import SettingsMenu
from core.menus.update_menu import UpdateMenu
from utils.constants import (
COLOR_MAGENTA,
COLOR_CYAN,
RESET_FORMAT,
@@ -87,6 +88,8 @@ class MainMenu(BaseMenu):
self.mr_repo = f"{COLOR_CYAN}{moonraker_status.get('repo')}{RESET_FORMAT}"
# mainsail
self.ms_status = get_mainsail_status()
# fluidd
self.fl_status = get_fluidd_status()
def format_status_by_code(self, code: int, status: str, count: str) -> str:
if code == 1:

54
kiauh/core/menus/remove_menu.py
View File

@@ -11,6 +11,7 @@
import textwrap
from components.fluidd.menus.fluidd_remove_menu import FluiddRemoveMenu
from components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu
from components.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu
from components.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu
@@ -29,16 +30,16 @@ class RemoveMenu(BaseMenu):
"1": KlipperRemoveMenu,
"2": MoonrakerRemoveMenu,
"3": MainsailRemoveMenu,
"5": self.remove_fluidd,
"6": self.remove_klipperscreen,
"7": self.remove_crowsnest,
"8": self.remove_mjpgstreamer,
"9": self.remove_pretty_gcode,
"10": self.remove_telegram_bot,
"11": self.remove_obico,
"12": self.remove_octoeverywhere,
"13": self.remove_mobileraker,
"14": self.remove_nginx,
"4": FluiddRemoveMenu,
"5": None,
"6": None,
"7": None,
"8": None,
"9": None,
"10": None,
"11": None,
"12": None,
"13": None,
},
footer_type=BACK_FOOTER,
)
@@ -69,36 +70,3 @@ class RemoveMenu(BaseMenu):
"""
)[1:]
print(menu, end="")
def remove_fluidd(self, **kwargs):
print("remove_fluidd")
def remove_fluidd_config(self, **kwargs):
print("remove_fluidd_config")
def remove_klipperscreen(self, **kwargs):
print("remove_klipperscreen")
def remove_crowsnest(self, **kwargs):
print("remove_crowsnest")
def remove_mjpgstreamer(self, **kwargs):
print("remove_mjpgstreamer")
def remove_pretty_gcode(self, **kwargs):
print("remove_pretty_gcode")
def remove_telegram_bot(self, **kwargs):
print("remove_telegram_bot")
def remove_obico(self, **kwargs):
print("remove_obico")
def remove_octoeverywhere(self, **kwargs):
print("remove_octoeverywhere")
def remove_mobileraker(self, **kwargs):
print("remove_mobileraker")
def remove_nginx(self, **kwargs):
print("remove_nginx")

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

@@ -11,20 +11,25 @@
import textwrap
from kiauh.components.klipper.klipper_setup import update_klipper
from kiauh.components.klipper.klipper_utils import (
from components.fluidd.fluidd_setup import update_fluidd
from components.fluidd.fluidd_utils import (
get_fluidd_local_version,
get_fluidd_remote_version,
)
from components.klipper.klipper_setup import update_klipper
from components.klipper.klipper_utils import (
get_klipper_status,
)
from kiauh.components.mainsail.mainsail_setup import update_mainsail
from kiauh.components.mainsail.mainsail_utils import (
from components.mainsail.mainsail_setup import update_mainsail
from components.mainsail.mainsail_utils import (
get_mainsail_local_version,
get_mainsail_remote_version,
)
from kiauh.components.moonraker.moonraker_setup import update_moonraker
from kiauh.components.moonraker.moonraker_utils import get_moonraker_status
from kiauh.core.menus import BACK_FOOTER
from kiauh.core.menus.base_menu import BaseMenu
from kiauh.utils.constants import (
from components.moonraker.moonraker_setup import update_moonraker
from components.moonraker.moonraker_utils import get_moonraker_status
from core.menus import BACK_FOOTER
from core.menus.base_menu import BaseMenu
from utils.constants import (
COLOR_GREEN,
RESET_FORMAT,
COLOR_YELLOW,
@@ -62,6 +67,8 @@ class UpdateMenu(BaseMenu):
self.mr_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.ms_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.ms_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
self.fl_local = f"{COLOR_WHITE}{RESET_FORMAT}"
self.fl_remote = f"{COLOR_WHITE}{RESET_FORMAT}"
def print_menu(self):
self.fetch_update_status()
@@ -82,7 +89,7 @@ class UpdateMenu(BaseMenu):
| | | |
| Klipper Webinterface: |---------------|---------------|
| 3) Mainsail | {self.ms_local:<22} | {self.ms_remote:<22} |
| 4) Fluidd | | |
| 4) Fluidd | {self.fl_local:<22} | {self.fl_remote:<22} |
| | | |
| Touchscreen GUI: |---------------|---------------|
| 5) KlipperScreen | | |
@@ -113,7 +120,7 @@ class UpdateMenu(BaseMenu):
update_mainsail()
def update_fluidd(self, **kwargs):
print("update_fluidd")
update_fluidd()
def update_klipperscreen(self, **kwargs):
print("update_klipperscreen")
@@ -166,3 +173,11 @@ class UpdateMenu(BaseMenu):
else:
self.ms_local = f"{COLOR_YELLOW}{self.ms_local}{RESET_FORMAT}"
self.ms_remote = f"{COLOR_GREEN if self.ms_remote != 'ERROR' else COLOR_RED}{self.ms_remote}{RESET_FORMAT}"
# fluidd
self.fl_local = get_fluidd_local_version()
self.fl_remote = get_fluidd_remote_version()
if self.fl_local == self.fl_remote:
self.fl_local = f"{COLOR_GREEN}{self.fl_local}{RESET_FORMAT}"
else:
self.fl_local = f"{COLOR_YELLOW}{self.fl_local}{RESET_FORMAT}"
self.fl_remote = f"{COLOR_GREEN if self.fl_remote != 'ERROR' else COLOR_RED}{self.fl_remote}{RESET_FORMAT}"