yadunut/clan-core
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

move FlakeId to flake id

Browse Source 
move FlakeId to flake id
This commit is contained in:
Jörg Thalheim
2024-07-03 13:03:40 +02:00
parent f5831f744c
commit 6037ad1ce0
30 changed files with 91 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/clan-cli/clan_cli/vms/inspect.py
View File

@@ -36,7 +36,7 @@ class InspectOptions:
def inspect_command(args: argparse.Namespace) -> None:
inspect_options = InspectOptions(
machine=args.machine,
flake=FlakeId(args.flake or Path.cwd()),
flake=args.flake or FlakeId(Path.cwd()),
)
machine = Machine(inspect_options.machine, inspect_options.flake)

12
pkgs/clan-cli/clan_cli/vms/run.py
View File

@@ -7,7 +7,6 @@ from contextlib import ExitStack
from pathlib import Path
from tempfile import TemporaryDirectory
from ..clan_uri import FlakeId
from ..cmd import Log, run
from ..completions import add_dynamic_completer, complete_machines
from ..dirs import module_root, user_cache_dir, vm_state_dir
@@ -194,16 +193,13 @@ def run_vm(
def run_command(
machine: str,
flake: Path,
option: list[str] = [],
**kwargs: dict[str, str],
args: argparse.Namespace,
) -> None:
machine_obj: Machine = Machine(machine, FlakeId(flake))
machine_obj: Machine = Machine(args.machine, args.flake)
vm: VmConfig = inspect_vm(machine=machine_obj)
run_vm(vm, nix_options=option)
run_vm(vm, nix_options=args.option)
def register_run_parser(parser: argparse.ArgumentParser) -> None:
@@ -211,4 +207,4 @@ def register_run_parser(parser: argparse.ArgumentParser) -> None:
"machine", type=str, help="machine in the flake to run"
)
add_dynamic_completer(machine_action, complete_machines)
parser.set_defaults(func=lambda args: run_command(**args.__dict__))
parser.set_defaults(func=lambda args: run_command(args))