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

vars: refactor: use Machine objects instead of base_dir strings

Browse Source 
Replace base_dir string parameters with Machine objects throughout the vars
module for better type safety and consistency.
This commit is contained in:
DavHau
2025-08-19 18:30:53 +07:00
parent bdab3e23af
commit 7b61a668e9
6 changed files with 25 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/clan-cli/clan_cli/vars/get.py
View File

@@ -9,6 +9,7 @@ from clan_cli.completions import (
)
from clan_lib.errors import ClanError
from clan_lib.flake import Flake, require_flake
from clan_lib.machines.machines import Machine
from .generator import Var
from .list import get_machine_vars
@@ -16,9 +17,9 @@ from .list import get_machine_vars
log = logging.getLogger(__name__)
def get_machine_var(base_dir: str, machine_name: str, var_id: str) -> Var:
log.debug(f"getting var: {var_id} from machine: {machine_name}")
vars_ = get_machine_vars(base_dir=base_dir, machine_name=machine_name)
def get_machine_var(machine: Machine, var_id: str) -> Var:
log.debug(f"getting var: {var_id} from machine: {machine.name}")
vars_ = get_machine_vars(machine)
results = []
for var in vars_:
if var.id == var_id:
@@ -44,7 +45,8 @@ def get_machine_var(base_dir: str, machine_name: str, var_id: str) -> Var:
def get_command(machine_name: str, var_id: str, flake: Flake) -> None:
var = get_machine_var(str(flake.path), machine_name, var_id)
machine = Machine(name=machine_name, flake=flake)
var = get_machine_var(machine, var_id)
if not var.exists:
msg = f"Var {var.id} has not been generated yet"
raise ClanError(msg)