ruff: apply automatic fixes

This commit is contained in:
Jörg Thalheim
2025-08-20 13:52:45 +02:00
parent 798d445f3e
commit ea2d6aab65
217 changed files with 2283 additions and 1739 deletions

View File

@@ -13,13 +13,13 @@ log = logging.getLogger(__name__)
@contextmanager
def pause_automounting(
devices: list[Path], machine: Machine, request_graphical: bool = False
devices: list[Path],
machine: Machine,
request_graphical: bool = False,
) -> Generator[None]:
"""
Pause automounting on the device for the duration of this context
"""Pause automounting on the device for the duration of this context
manager
"""
if shutil.which("udevadm") is None:
msg = "udev is required to disable automounting"
log.warning(msg)

View File

@@ -28,7 +28,7 @@ log = logging.getLogger(__name__)
class SystemConfig:
keymap: str = field(default="en")
language: str = field(
default="en_US.UTF-8"
default="en_US.UTF-8",
) # Leave this default, or implement virtual scrolling for the 400+ options in the UI.
ssh_keys_path: list[str] | None = field(default=None)
@@ -57,6 +57,7 @@ def run_machine_flash(
graphical: bool = False,
) -> None:
"""Flash a machine with the given configuration.
Args:
machine: The Machine instance to flash.
mode: The mode to use for flashing (e.g., "install", "reinstall
@@ -67,9 +68,11 @@ def run_machine_flash(
debug: If True, enable debug mode.
extra_args: Additional arguments to pass to the disko-install command.
graphical: If True, run the command in graphical mode.
Raises:
ClanError: If the language or keymap is invalid, or if there are issues with
reading SSH keys, or if disko-install fails.
"""
devices = [Path(disk.device) for disk in disks]
with pause_automounting(devices, machine, request_graphical=graphical):
@@ -98,7 +101,7 @@ def run_machine_flash(
raise ClanError(msg)
system_config_nix["console"] = {"keyMap": system_config.keymap}
system_config_nix["services"] = {
"xserver": {"xkb": {"layout": system_config.keymap}}
"xserver": {"xkb": {"layout": system_config.keymap}},
}
if system_config.ssh_keys_path:
@@ -110,7 +113,7 @@ def run_machine_flash(
msg = f"Cannot read SSH public key file: {key_path}: {e}"
raise ClanError(msg) from e
system_config_nix["users"] = {
"users": {"root": {"openssh": {"authorizedKeys": {"keys": root_keys}}}}
"users": {"root": {"openssh": {"authorizedKeys": {"keys": root_keys}}}},
}
from clan_cli.vars.generator import Generator
@@ -141,7 +144,7 @@ def run_machine_flash(
"disko_install=$(command -v disko-install);",
"exec",
*cmd_with_root(['"$disko_install" "$@"'], graphical=graphical),
]
],
)
disko_install.extend(["bash", "-c", wrapper])
@@ -164,7 +167,7 @@ def run_machine_flash(
[
"--system-config",
json.dumps(system_config_nix),
]
],
)
disko_install.extend(["--option", "dry-run", "true"])
disko_install.extend(extra_args)

View File

@@ -20,10 +20,13 @@ class FlashOptions(TypedDict):
@API.register
def get_machine_flash_options() -> FlashOptions:
"""Retrieve available languages and keymaps for flash configuration.
Returns:
FlashOptions: A dictionary containing lists of available languages and keymaps.
Raises:
ClanError: If the locale file or keymaps directory does not exist.
"""
return {"languages": list_languages(), "keymaps": list_keymaps()}