Finished clan history command. Ported remaining async to sync funcs

pkgs/clan-cli/clan_cli/flakes/create.py

@@ -2,14 +2,14 @@
 import argparse
 from pathlib import Path
 
-from ..async_cmd import CmdOut, run, runforcli
+from ..cmd import CmdOut, run, runforcli
 from ..errors import ClanError
 from ..nix import nix_command, nix_shell
 
 DEFAULT_URL: str = "git+https://git.clan.lol/clan/clan-core?new-clan"
 
 
-async def create_flake(directory: Path, url: str) -> dict[str, CmdOut]:
+def create_flake(directory: Path, url: str) -> dict[str, CmdOut]:
     if not directory.exists():
         directory.mkdir()
     else:
@@ -23,36 +23,27 @@ async def create_flake(directory: Path, url: str) -> dict[str, CmdOut]:
             url,
         ]
     )
-    out = await run(command, cwd=directory)
+    out = run(command, cwd=directory)
     response["flake init"] = out
 
     command = nix_shell(["nixpkgs#git"], ["git", "init"])
-    out = await run(command, cwd=directory)
+    out = run(command, cwd=directory)
     response["git init"] = out
 
     command = nix_shell(["nixpkgs#git"], ["git", "add", "."])
-    out = await run(command, cwd=directory)
+    out = run(command, cwd=directory)
     response["git add"] = out
 
-    # command = nix_shell(["nixpkgs#git"], ["git", "config", "init.defaultBranch", "main"])
-    # out = await run(command, cwd=directory)
-    # response["git config"] = out
-
     command = nix_shell(["nixpkgs#git"], ["git", "config", "user.name", "clan-tool"])
-    out = await run(command, cwd=directory)
+    out = run(command, cwd=directory)
     response["git config"] = out
 
     command = nix_shell(
         ["nixpkgs#git"], ["git", "config", "user.email", "clan@example.com"]
     )
-    out = await run(command, cwd=directory)
+    out = run(command, cwd=directory)
     response["git config"] = out
 
-    # TODO: Find out why this fails on Johannes machine
-    # command = nix_shell(["nixpkgs#git"], ["git", "commit", "-a", "-m", "Initial commit"])
-    # out = await run(command, cwd=directory)
-    # response["git commit"] = out
-
     return response
 
 

pkgs/clan-cli/clan_cli/flakes/inspect.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 from ..errors import ClanError
 from ..machines.list import list_machines
-from ..nix import nix_config, nix_eval, nix_metadata
+from ..nix import nix_build, nix_config, nix_eval, nix_metadata
 
 
 @dataclass
@@ -14,6 +14,7 @@ class FlakeConfig:
     flake_url: str | Path
     flake_attr: str
 
+    clan_name: str
     nar_hash: str
     icon: str | None
     description: str | None
@@ -56,10 +57,52 @@ stderr:
     else:
         icon_path = res.strip('"')
 
+        if not Path(icon_path).exists():
+            cmd = nix_build(
+                [
+                    f'{flake_url}#clanInternals.machines."{system}"."{flake_attr}".config.clanCore.clanIcon'
+                ]
+            )
+            proc = subprocess.run(cmd, text=True, capture_output=True)
+            assert proc.stdout is not None
+            if proc.returncode != 0:
+                raise ClanError(
+                    f"""
+command: {shlex.join(cmd)}
+exit code: {proc.returncode}
+stdout:
+{proc.stdout}
+stderr:
+{proc.stderr}
+"""
+                )
+
+    cmd = nix_eval(
+        [
+            f'{flake_url}#clanInternals.machines."{system}"."{flake_attr}".config.clanCore.clanName'
+        ]
+    )
+
+    proc = subprocess.run(cmd, text=True, capture_output=True)
+    assert proc.stdout is not None
+    if proc.returncode != 0:
+        raise ClanError(
+            f"""
+command: {shlex.join(cmd)}
+exit code: {proc.returncode}
+stdout:
+{proc.stdout}
+stderr:
+{proc.stderr}
+"""
+        )
+    clan_name = proc.stdout.strip().strip('"')
+
     meta = nix_metadata(flake_url)
 
     return FlakeConfig(
         flake_url=flake_url,
+        clan_name=clan_name,
         flake_attr=flake_attr,
         nar_hash=meta["locked"]["narHash"],
         icon=icon_path,
@@ -83,6 +126,7 @@ def inspect_command(args: argparse.Namespace) -> None:
     res = inspect_flake(
         flake_url=inspect_options.flake, flake_attr=inspect_options.machine
     )
+    print("cLAN name:", res.clan_name)
     print("Icon:", res.icon)
     print("Description:", res.description)
     print("Last updated:", res.last_updated)