diff --git a/kiauh/components/klipper/klipper.py b/kiauh/components/klipper/klipper.py index 1f8e6e5..1b442c6 100644 --- a/kiauh/components/klipper/klipper.py +++ b/kiauh/components/klipper/klipper.py @@ -13,8 +13,8 @@ import subprocess from pathlib import Path from typing import List -from kiauh.core.instance_manager.base_instance import BaseInstance from kiauh.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR, MODULE_PATH +from kiauh.core.instance_manager.base_instance import BaseInstance from kiauh.utils.constants import SYSTEMD from kiauh.utils.logger import Logger diff --git a/kiauh/components/klipper/klipper_remove.py b/kiauh/components/klipper/klipper_remove.py index 3534094..61b007c 100644 --- a/kiauh/components/klipper/klipper_remove.py +++ b/kiauh/components/klipper/klipper_remove.py @@ -12,10 +12,10 @@ import shutil from typing import List, Union -from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.components.klipper import KLIPPER_DIR, KLIPPER_ENV_DIR from kiauh.components.klipper.klipper import Klipper from kiauh.components.klipper.klipper_dialogs import print_instance_overview +from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.utils.filesystem_utils import remove_file from kiauh.utils.input_utils import get_selection_input from kiauh.utils.logger import Logger diff --git a/kiauh/components/klipper/klipper_setup.py b/kiauh/components/klipper/klipper_setup.py index 05cfb1c..1e553f2 100644 --- a/kiauh/components/klipper/klipper_setup.py +++ b/kiauh/components/klipper/klipper_setup.py @@ -18,7 +18,7 @@ from kiauh.components.klipper import ( KLIPPER_DIR, KLIPPER_ENV_DIR, KLIPPER_REQUIREMENTS_TXT, - ) +) from kiauh.components.klipper.klipper import Klipper from kiauh.components.klipper.klipper_dialogs import print_update_warn_dialog from kiauh.components.klipper.klipper_utils import ( @@ -33,7 +33,7 @@ from kiauh.components.klipper.klipper_utils import ( update_name_scheme, handle_instance_naming, backup_klipper_dir, - ) +) from kiauh.components.moonraker.moonraker import Moonraker from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager @@ -46,7 +46,7 @@ from kiauh.utils.system_utils import ( install_python_requirements, update_system_package_lists, install_system_packages, - ) +) def install_klipper() -> None: diff --git a/kiauh/components/klipper/klipper_utils.py b/kiauh/components/klipper/klipper_utils.py index 373afc3..564d7f7 100644 --- a/kiauh/components/klipper/klipper_utils.py +++ b/kiauh/components/klipper/klipper_utils.py @@ -23,14 +23,14 @@ from kiauh.components.klipper import ( KLIPPER_DIR, KLIPPER_ENV_DIR, KLIPPER_BACKUP_DIR, - ) +) from kiauh.components.klipper.klipper import Klipper from kiauh.components.klipper.klipper_dialogs import ( print_missing_usergroup_dialog, print_instance_overview, print_select_instance_count_dialog, print_select_custom_name_dialog, - ) +) from kiauh.components.moonraker.moonraker import Moonraker from kiauh.components.moonraker.moonraker_utils import moonraker_to_multi_conversion from kiauh.core.backup_manager.backup_manager import BackupManager @@ -46,12 +46,10 @@ from kiauh.utils.logger import Logger from kiauh.utils.system_utils import mask_system_service -def get_klipper_status() -> ( - Dict[ - Literal["status", "status_code", "instances", "repo", "local", "remote"], - Union[str, int], - ] -): +def get_klipper_status() -> Dict[ + Literal["status", "status_code", "instances", "repo", "local", "remote"], + Union[str, int], +]: status = get_install_status_common(Klipper, KLIPPER_DIR, KLIPPER_ENV_DIR) return { "status": status.get("status"), diff --git a/kiauh/components/klipper/menus/klipper_remove_menu.py b/kiauh/components/klipper/menus/klipper_remove_menu.py index 7ee5461..a36d51b 100644 --- a/kiauh/components/klipper/menus/klipper_remove_menu.py +++ b/kiauh/components/klipper/menus/klipper_remove_menu.py @@ -11,9 +11,9 @@ import textwrap +from kiauh.components.klipper import klipper_remove from kiauh.core.menus import BACK_HELP_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.components.klipper import klipper_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN diff --git a/kiauh/components/log_uploads/log_upload_utils.py b/kiauh/components/log_uploads/log_upload_utils.py index 9ce95c8..4247a0e 100644 --- a/kiauh/components/log_uploads/log_upload_utils.py +++ b/kiauh/components/log_uploads/log_upload_utils.py @@ -9,14 +9,13 @@ # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # -from typing import List -from pathlib import Path - import urllib.request +from pathlib import Path +from typing import List -from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.components.klipper.klipper import Klipper from kiauh.components.log_uploads import LogFile +from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.utils.logger import Logger diff --git a/kiauh/components/log_uploads/menus/log_upload_menu.py b/kiauh/components/log_uploads/menus/log_upload_menu.py index c140b2e..11bb65e 100644 --- a/kiauh/components/log_uploads/menus/log_upload_menu.py +++ b/kiauh/components/log_uploads/menus/log_upload_menu.py @@ -11,10 +11,10 @@ import textwrap +from kiauh.components.log_uploads.log_upload_utils import get_logfile_list +from kiauh.components.log_uploads.log_upload_utils import upload_logfile from kiauh.core.menus import BACK_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.components.log_uploads.log_upload_utils import upload_logfile -from kiauh.components.log_uploads.log_upload_utils import get_logfile_list from kiauh.utils.constants import RESET_FORMAT, COLOR_YELLOW diff --git a/kiauh/components/mainsail/mainsail_remove.py b/kiauh/components/mainsail/mainsail_remove.py index fc396ba..3a4f797 100644 --- a/kiauh/components/mainsail/mainsail_remove.py +++ b/kiauh/components/mainsail/mainsail_remove.py @@ -15,12 +15,12 @@ import subprocess from pathlib import Path from typing import List -from kiauh.core.config_manager.config_manager import ConfigManager -from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.components.klipper.klipper import Klipper from kiauh.components.mainsail import MAINSAIL_DIR, MAINSAIL_CONFIG_DIR from kiauh.components.mainsail.mainsail_utils import backup_config_json from kiauh.components.moonraker.moonraker import Moonraker +from kiauh.core.config_manager.config_manager import ConfigManager +from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED from kiauh.utils.filesystem_utils import remove_file from kiauh.utils.logger import Logger diff --git a/kiauh/components/mainsail/mainsail_setup.py b/kiauh/components/mainsail/mainsail_setup.py index 33b764a..e370847 100644 --- a/kiauh/components/mainsail/mainsail_setup.py +++ b/kiauh/components/mainsail/mainsail_setup.py @@ -14,9 +14,6 @@ from pathlib import Path from typing import List from kiauh import KIAUH_CFG -from kiauh.core.config_manager.config_manager import ConfigManager -from kiauh.core.instance_manager.instance_manager import InstanceManager -from kiauh.core.repo_manager.repo_manager import RepoManager from kiauh.components.klipper.klipper import Klipper from kiauh.components.mainsail import ( MAINSAIL_URL, @@ -38,6 +35,9 @@ from kiauh.components.mainsail.mainsail_utils import ( symlink_webui_nginx_log, ) from kiauh.components.moonraker.moonraker import Moonraker +from kiauh.core.config_manager.config_manager import ConfigManager +from kiauh.core.instance_manager.instance_manager import InstanceManager +from kiauh.core.repo_manager.repo_manager import RepoManager from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_SITES_ENABLED from kiauh.utils.common import check_install_dependencies from kiauh.utils.filesystem_utils import ( diff --git a/kiauh/components/mainsail/mainsail_utils.py b/kiauh/components/mainsail/mainsail_utils.py index 9a01e9d..3cb7102 100644 --- a/kiauh/components/mainsail/mainsail_utils.py +++ b/kiauh/components/mainsail/mainsail_utils.py @@ -21,7 +21,7 @@ from kiauh.components.mainsail import ( MAINSAIL_CONFIG_JSON, MAINSAIL_DIR, MAINSAIL_BACKUP_DIR, - ) +) from kiauh.core.backup_manager.backup_manager import BackupManager from kiauh.utils import NGINX_SITES_AVAILABLE, NGINX_CONFD from kiauh.utils.common import get_install_status_webui diff --git a/kiauh/components/mainsail/menus/mainsail_remove_menu.py b/kiauh/components/mainsail/menus/mainsail_remove_menu.py index 47488fc..187d974 100644 --- a/kiauh/components/mainsail/menus/mainsail_remove_menu.py +++ b/kiauh/components/mainsail/menus/mainsail_remove_menu.py @@ -11,9 +11,9 @@ import textwrap +from kiauh.components.mainsail import mainsail_remove from kiauh.core.menus import BACK_HELP_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.components.mainsail import mainsail_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN diff --git a/kiauh/components/moonraker/menus/moonraker_remove_menu.py b/kiauh/components/moonraker/menus/moonraker_remove_menu.py index f8bc307..962e07d 100644 --- a/kiauh/components/moonraker/menus/moonraker_remove_menu.py +++ b/kiauh/components/moonraker/menus/moonraker_remove_menu.py @@ -11,9 +11,9 @@ import textwrap +from kiauh.components.moonraker import moonraker_remove from kiauh.core.menus import BACK_HELP_FOOTER from kiauh.core.menus.base_menu import BaseMenu -from kiauh.components.moonraker import moonraker_remove from kiauh.utils.constants import RESET_FORMAT, COLOR_RED, COLOR_CYAN diff --git a/kiauh/components/moonraker/moonraker_dialogs.py b/kiauh/components/moonraker/moonraker_dialogs.py index 62867bd..2bc18b2 100644 --- a/kiauh/components/moonraker/moonraker_dialogs.py +++ b/kiauh/components/moonraker/moonraker_dialogs.py @@ -12,9 +12,9 @@ import textwrap from typing import List -from kiauh.core.menus.base_menu import print_back_footer from kiauh.components.klipper.klipper import Klipper from kiauh.components.moonraker.moonraker import Moonraker +from kiauh.core.menus.base_menu import print_back_footer from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_CYAN @@ -39,11 +39,11 @@ def print_moonraker_overview( dialog += "| |\n" instance_map = { - k.get_service_file_name(): k.get_service_file_name().replace( - "klipper", "moonraker" + k.get_service_file_name(): ( + k.get_service_file_name().replace("klipper", "moonraker") + if k.suffix in [m.suffix for m in moonraker_instances] + else "" ) - if k.suffix in [m.suffix for m in moonraker_instances] - else "" for k in klipper_instances } diff --git a/kiauh/components/moonraker/moonraker_remove.py b/kiauh/components/moonraker/moonraker_remove.py index cc76be8..02af9dd 100644 --- a/kiauh/components/moonraker/moonraker_remove.py +++ b/kiauh/components/moonraker/moonraker_remove.py @@ -13,10 +13,10 @@ import shutil import subprocess from typing import List, Union -from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.components.klipper.klipper_dialogs import print_instance_overview from kiauh.components.moonraker import MOONRAKER_DIR, MOONRAKER_ENV_DIR from kiauh.components.moonraker.moonraker import Moonraker +from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.utils.filesystem_utils import remove_file from kiauh.utils.input_utils import get_selection_input from kiauh.utils.logger import Logger diff --git a/kiauh/components/moonraker/moonraker_setup.py b/kiauh/components/moonraker/moonraker_setup.py index 9ed8fa0..f041a0e 100644 --- a/kiauh/components/moonraker/moonraker_setup.py +++ b/kiauh/components/moonraker/moonraker_setup.py @@ -29,13 +29,13 @@ from kiauh.components.moonraker import ( POLKIT_FILE, POLKIT_USR_FILE, POLKIT_SCRIPT, - ) +) from kiauh.components.moonraker.moonraker import Moonraker from kiauh.components.moonraker.moonraker_dialogs import print_moonraker_overview from kiauh.components.moonraker.moonraker_utils import ( create_example_moonraker_conf, backup_moonraker_dir, - ) +) from kiauh.core.config_manager.config_manager import ConfigManager from kiauh.core.instance_manager.instance_manager import InstanceManager from kiauh.core.repo_manager.repo_manager import RepoManager @@ -43,7 +43,7 @@ from kiauh.utils.filesystem_utils import check_file_exist from kiauh.utils.input_utils import ( get_confirm, get_selection_input, - ) +) from kiauh.utils.logger import Logger from kiauh.utils.system_utils import ( parse_packages_from_file, @@ -51,7 +51,7 @@ from kiauh.utils.system_utils import ( install_python_requirements, update_system_package_lists, install_system_packages, - ) +) def install_moonraker() -> None: diff --git a/kiauh/components/moonraker/moonraker_utils.py b/kiauh/components/moonraker/moonraker_utils.py index e3db3c6..0a9ae11 100644 --- a/kiauh/components/moonraker/moonraker_utils.py +++ b/kiauh/components/moonraker/moonraker_utils.py @@ -21,7 +21,7 @@ from kiauh.components.moonraker import ( MOONRAKER_ENV_DIR, MOONRAKER_BACKUP_DIR, MOONRAKER_DB_BACKUP_DIR, - ) +) from kiauh.components.moonraker.moonraker import Moonraker from kiauh.core.backup_manager.backup_manager import BackupManager from kiauh.core.config_manager.config_manager import ConfigManager @@ -31,15 +31,13 @@ from kiauh.utils.common import get_install_status_common from kiauh.utils.logger import Logger from kiauh.utils.system_utils import ( get_ipv4_addr, - ) +) -def get_moonraker_status() -> ( - Dict[ - Literal["status", "status_code", "instances", "repo", "local", "remote"], - Union[str, int], - ] -): +def get_moonraker_status() -> Dict[ + Literal["status", "status_code", "instances", "repo", "local", "remote"], + Union[str, int], +]: status = get_install_status_common(Moonraker, MOONRAKER_DIR, MOONRAKER_ENV_DIR) return { "status": status.get("status"), diff --git a/kiauh/core/backup_manager/backup_manager.py b/kiauh/core/backup_manager/backup_manager.py index 7f5a887..8f2dbcf 100644 --- a/kiauh/core/backup_manager/backup_manager.py +++ b/kiauh/core/backup_manager/backup_manager.py @@ -41,9 +41,7 @@ class BackupManager: def ignore_folders(self, value: List[str]): self._ignore_folders = value - def backup_file( - self, file: Path = None, target: Path = None, custom_filename=None - ): + def backup_file(self, file: Path = None, target: Path = None, custom_filename=None): if not file: raise ValueError("Parameter 'file' cannot be None!") @@ -84,7 +82,6 @@ class BackupManager: Logger.print_error(f"Unable to backup directory '{source}':\n{e}") return - def ignore_folders_func(self, dirpath, filenames): return ( [f for f in filenames if f in self._ignore_folders] diff --git a/kiauh/core/instance_manager/instance_manager.py b/kiauh/core/instance_manager/instance_manager.py index d4e2f28..0a920d6 100644 --- a/kiauh/core/instance_manager/instance_manager.py +++ b/kiauh/core/instance_manager/instance_manager.py @@ -18,7 +18,6 @@ from kiauh.core.instance_manager.base_instance import BaseInstance from kiauh.utils.constants import SYSTEMD from kiauh.utils.logger import Logger - I = TypeVar(name="I", bound=BaseInstance, covariant=True) diff --git a/kiauh/core/menus/backup_menu.py b/kiauh/core/menus/backup_menu.py index ffc246b..184e26c 100644 --- a/kiauh/core/menus/backup_menu.py +++ b/kiauh/core/menus/backup_menu.py @@ -16,7 +16,7 @@ from kiauh.components.mainsail.mainsail_utils import backup_mainsail_data from kiauh.components.moonraker.moonraker_utils import ( backup_moonraker_dir, backup_moonraker_db_dir, - ) +) from kiauh.core.menus import BACK_FOOTER from kiauh.core.menus.base_menu import BaseMenu from kiauh.utils.common import backup_printer_config_dir @@ -34,7 +34,7 @@ class BackupMenu(BaseMenu): "2": self.backup_moonraker, "3": self.backup_printer_config, "4": self.backup_moonraker_db, - "5": self.backup_mainsail + "5": self.backup_mainsail, }, footer_type=BACK_FOOTER, ) diff --git a/kiauh/core/menus/base_menu.py b/kiauh/core/menus/base_menu.py index 2cdf379..89ed09b 100644 --- a/kiauh/core/menus/base_menu.py +++ b/kiauh/core/menus/base_menu.py @@ -13,7 +13,7 @@ import subprocess import sys import textwrap from abc import abstractmethod, ABC -from typing import Dict, Any, Literal, Union, Callable, Type +from typing import Dict, Any, Literal, Union, Callable from kiauh.core.menus import QUIT_FOOTER, BACK_FOOTER, BACK_HELP_FOOTER from kiauh.utils.constants import ( diff --git a/kiauh/core/menus/extensions_menu.py b/kiauh/core/menus/extensions_menu.py index ebbc4c5..50fd53b 100644 --- a/kiauh/core/menus/extensions_menu.py +++ b/kiauh/core/menus/extensions_menu.py @@ -9,10 +9,10 @@ # This file may be distributed under the terms of the GNU GPLv3 license # # ======================================================================= # -import json -import textwrap import importlib import inspect +import json +import textwrap from pathlib import Path from typing import List, Dict diff --git a/kiauh/core/menus/install_menu.py b/kiauh/core/menus/install_menu.py index 239dfaf..85e1ef3 100644 --- a/kiauh/core/menus/install_menu.py +++ b/kiauh/core/menus/install_menu.py @@ -11,11 +11,11 @@ import textwrap -from kiauh.core.menus import BACK_FOOTER -from kiauh.core.menus.base_menu import BaseMenu from kiauh.components.klipper import klipper_setup from kiauh.components.mainsail import mainsail_setup from kiauh.components.moonraker import moonraker_setup +from kiauh.core.menus import BACK_FOOTER +from kiauh.core.menus.base_menu import BaseMenu from kiauh.utils.constants import COLOR_GREEN, RESET_FORMAT diff --git a/kiauh/core/menus/main_menu.py b/kiauh/core/menus/main_menu.py index 14c80cc..60dc9f8 100644 --- a/kiauh/core/menus/main_menu.py +++ b/kiauh/core/menus/main_menu.py @@ -31,7 +31,7 @@ from kiauh.utils.constants import ( COLOR_RED, COLOR_GREEN, COLOR_YELLOW, - ) +) # noinspection PyMethodMayBeStatic diff --git a/kiauh/core/menus/remove_menu.py b/kiauh/core/menus/remove_menu.py index 060927e..1bd2eba 100644 --- a/kiauh/core/menus/remove_menu.py +++ b/kiauh/core/menus/remove_menu.py @@ -11,11 +11,11 @@ import textwrap -from kiauh.core.menus import BACK_FOOTER -from kiauh.core.menus.base_menu import BaseMenu from kiauh.components.klipper.menus.klipper_remove_menu import KlipperRemoveMenu from kiauh.components.mainsail.menus.mainsail_remove_menu import MainsailRemoveMenu from kiauh.components.moonraker.menus.moonraker_remove_menu import MoonrakerRemoveMenu +from kiauh.core.menus import BACK_FOOTER +from kiauh.core.menus.base_menu import BaseMenu from kiauh.utils.constants import COLOR_RED, RESET_FORMAT diff --git a/kiauh/core/menus/update_menu.py b/kiauh/core/menus/update_menu.py index c90de1c..f2951dd 100644 --- a/kiauh/core/menus/update_menu.py +++ b/kiauh/core/menus/update_menu.py @@ -11,8 +11,6 @@ import textwrap -from kiauh.core.menus import BACK_FOOTER -from kiauh.core.menus.base_menu import BaseMenu from kiauh.components.klipper.klipper_setup import update_klipper from kiauh.components.klipper.klipper_utils import ( get_klipper_status, @@ -24,6 +22,8 @@ from kiauh.components.mainsail.mainsail_utils import ( ) 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 COLOR_GREEN, RESET_FORMAT, COLOR_YELLOW, COLOR_WHITE diff --git a/kiauh/extensions/gcode_shell_cmd/__init__.py b/kiauh/extensions/gcode_shell_cmd/__init__.py index c0d921b..27ffecb 100644 --- a/kiauh/extensions/gcode_shell_cmd/__init__.py +++ b/kiauh/extensions/gcode_shell_cmd/__init__.py @@ -11,7 +11,6 @@ from pathlib import Path - EXT_MODULE_NAME = "gcode_shell_command.py" MODULE_PATH = Path(__file__).resolve().parent MODULE_ASSETS = MODULE_PATH.joinpath("assets") diff --git a/kiauh/extensions/gcode_shell_cmd/assets/gcode_shell_command.py b/kiauh/extensions/gcode_shell_cmd/assets/gcode_shell_command.py index bb38ae5..85b664b 100644 --- a/kiauh/extensions/gcode_shell_cmd/assets/gcode_shell_command.py +++ b/kiauh/extensions/gcode_shell_cmd/assets/gcode_shell_command.py @@ -3,27 +3,31 @@ # Copyright (C) 2019 Eric Callahan # # This file may be distributed under the terms of the GNU GPLv3 license. +import logging import os import shlex import subprocess -import logging + class ShellCommand: def __init__(self, config): self.name = config.get_name().split()[-1] self.printer = config.get_printer() - self.gcode = self.printer.lookup_object('gcode') - cmd = config.get('command') + self.gcode = self.printer.lookup_object("gcode") + cmd = config.get("command") cmd = os.path.expanduser(cmd) self.command = shlex.split(cmd) - self.timeout = config.getfloat('timeout', 2., above=0.) - self.verbose = config.getboolean('verbose', True) + self.timeout = config.getfloat("timeout", 2.0, above=0.0) + self.verbose = config.getboolean("verbose", True) self.proc_fd = None self.partial_output = "" self.gcode.register_mux_command( - "RUN_SHELL_COMMAND", "CMD", self.name, + "RUN_SHELL_COMMAND", + "CMD", + self.name, self.cmd_RUN_SHELL_COMMAND, - desc=self.cmd_RUN_SHELL_COMMAND_help) + desc=self.cmd_RUN_SHELL_COMMAND_help, + ) def _process_output(self, eventime): if self.proc_fd is None: @@ -33,11 +37,11 @@ class ShellCommand: except Exception: pass data = self.partial_output + data.decode() - if '\n' not in data: + if "\n" not in data: self.partial_output = data return - elif data[-1] != '\n': - split = data.rfind('\n') + 1 + elif data[-1] != "\n": + split = data.rfind("\n") + 1 self.partial_output = data[split:] data = data[:split] else: @@ -45,16 +49,19 @@ class ShellCommand: self.gcode.respond_info(data) cmd_RUN_SHELL_COMMAND_help = "Run a linux shell command" + def cmd_RUN_SHELL_COMMAND(self, params): - gcode_params = params.get('PARAMS','') + gcode_params = params.get("PARAMS", "") gcode_params = shlex.split(gcode_params) reactor = self.printer.get_reactor() try: proc = subprocess.Popen( - self.command + gcode_params, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + self.command + gcode_params, + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT, + ) except Exception: - logging.exception( - "shell_command: Command {%s} failed" % (self.name)) + logging.exception("shell_command: Command {%s} failed" % (self.name)) raise self.gcode.error("Error running command {%s}" % (self.name)) if self.verbose: self.proc_fd = proc.stdout.fileno() @@ -64,7 +71,7 @@ class ShellCommand: endtime = eventtime + self.timeout complete = False while eventtime < endtime: - eventtime = reactor.pause(eventtime + .05) + eventtime = reactor.pause(eventtime + 0.05) if proc.poll() is not None: complete = True break diff --git a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py index c0c28c1..a9798e2 100644 --- a/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py +++ b/kiauh/extensions/gcode_shell_cmd/gcode_shell_cmd_extension.py @@ -24,7 +24,7 @@ from kiauh.extensions.gcode_shell_cmd import ( KLIPPER_DIR, EXAMPLE_CFG_SRC, KLIPPER_EXTRAS, - ) +) from kiauh.utils.filesystem_utils import check_file_exist from kiauh.utils.input_utils import get_confirm from kiauh.utils.logger import Logger diff --git a/kiauh/utils/common.py b/kiauh/utils/common.py index 222b58d..6557cd0 100644 --- a/kiauh/utils/common.py +++ b/kiauh/utils/common.py @@ -23,7 +23,7 @@ from kiauh.utils.constants import ( COLOR_YELLOW, COLOR_GREEN, COLOR_RED, - ) +) from kiauh.utils.filesystem_utils import check_file_exist from kiauh.utils.logger import Logger from kiauh.utils.system_utils import check_package_install, install_system_packages diff --git a/kiauh/utils/system_utils.py b/kiauh/utils/system_utils.py index fce0977..1f3b018 100644 --- a/kiauh/utils/system_utils.py +++ b/kiauh/utils/system_utils.py @@ -285,7 +285,7 @@ def download_progress(block_num, block_size, total_size) -> None: mb = 1024 * 1024 progress = int(percent / 5) remaining = "-" * (20 - progress) - dl = f"\rDownloading: [{'#' * progress}{remaining}]{percent:.2f}% ({downloaded/mb:.2f}/{total_size/mb:.2f}MB)" + dl = f"\rDownloading: [{'#' * progress}{remaining}]{percent:.2f}% ({downloaded / mb:.2f}/{total_size / mb:.2f}MB)" sys.stdout.write(dl) sys.stdout.flush()