From 17f5d9092661e5b23b18697354bc591e9011e12a Mon Sep 17 00:00:00 2001
From: Qubasa <consulting@qube.email>
Date: Sun, 31 Dec 2023 14:56:03 +0100
Subject: [PATCH] history: added vm config to FlakeConfig

---
 pkgs/clan-cli/clan_cli/flakes/inspect.py             | 5 +++++
 pkgs/clan-cli/clan_cli/history/add.py                | 1 +
 pkgs/clan-vm-manager/clan_vm_manager/windows/join.py | 1 +
 3 files changed, 7 insertions(+)

diff --git a/pkgs/clan-cli/clan_cli/flakes/inspect.py b/pkgs/clan-cli/clan_cli/flakes/inspect.py
index fe0444f15..ade5561c8 100644
--- a/pkgs/clan-cli/clan_cli/flakes/inspect.py
+++ b/pkgs/clan-cli/clan_cli/flakes/inspect.py
@@ -8,6 +8,7 @@ from ..dirs import specific_groot_dir
 from ..errors import ClanError
 from ..machines.list import list_machines
 from ..nix import nix_build, nix_config, nix_eval, nix_metadata
+from ..vms.inspect import VmConfig, inspect_vm
 
 
 @dataclass
@@ -21,6 +22,7 @@ class FlakeConfig:
     description: str | None
     last_updated: str
     revision: str | None
+    vm: VmConfig
 
 
 def run_cmd(cmd: list[str]) -> str:
@@ -50,6 +52,8 @@ def inspect_flake(flake_url: str | Path, flake_attr: str) -> FlakeConfig:
             f"Machine {flake_attr} not found in {flake_url}. Available machines: {', '.join(machines)}"
         )
 
+    vm = inspect_vm(flake_url, flake_attr)
+
     # Get the cLAN name
     cmd = nix_eval(
         [
@@ -86,6 +90,7 @@ def inspect_flake(flake_url: str | Path, flake_attr: str) -> FlakeConfig:
     meta = nix_metadata(flake_url)
 
     return FlakeConfig(
+        vm=vm,
         flake_url=flake_url,
         clan_name=clan_name,
         flake_attr=flake_attr,
diff --git a/pkgs/clan-cli/clan_cli/history/add.py b/pkgs/clan-cli/clan_cli/history/add.py
index a2c0fabd7..bc3264377 100644
--- a/pkgs/clan-cli/clan_cli/history/add.py
+++ b/pkgs/clan-cli/clan_cli/history/add.py
@@ -46,6 +46,7 @@ def list_history() -> list[HistoryEntry]:
     return logs
 
 
+# TODO: Add all vm entries to history
 def add_history(uri: ClanURI) -> list[HistoryEntry]:
     uri.check_exits()
     user_history_file().parent.mkdir(parents=True, exist_ok=True)
diff --git a/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py b/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py
index 123481e0d..18f5499f2 100644
--- a/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py
+++ b/pkgs/clan-vm-manager/clan_vm_manager/windows/join.py
@@ -75,6 +75,7 @@ class Trust(Gtk.Box):
         self.set_center_widget(layout)
 
     def on_trust(self, widget: Gtk.Widget) -> None:
+        # TODO: @Johannes, replace image with real clan logo
         try:
             uri = self.url or ClanURI(self.entry.get_text())
             print(f"trusted: {uri}")