Revert "Merge pull request 'clan-cli: Refactor the API to use the Flake object' (#3531) from Qubasa/clan-core:replace_machine_name_with_machine_obj into main"

This reverts commit 572ce8885f, reversing
changes made to 0bee027251.

pkgs/clan-cli/clan_cli/dirs.py

@@ -1,6 +1,7 @@
 import logging
 import os
 import sys
+import urllib
 from enum import Enum
 from pathlib import Path
 
@@ -23,6 +24,14 @@ def find_git_repo_root() -> Path | None:
     return find_toplevel([".git"])
 
 
+def clan_key_safe(flake_url: str) -> str:
+    """
+    only embed the url in the path, not the clan name, as it would involve eval.
+    """
+    quoted_url = urllib.parse.quote_plus(flake_url)
+    return f"{quoted_url}"
+
+
 def find_toplevel(top_level_files: list[str]) -> Path | None:
     """Returns the path to the toplevel of the clan flake"""
     for project_file in top_level_files:
@@ -105,10 +114,31 @@ def user_gcroot_dir() -> Path:
     return p
 
 
+def machine_gcroot(flake_url: str) -> Path:
+    # Always build icon so that we can symlink it to the gcroot
+    gcroot_dir = user_gcroot_dir()
+    clan_gcroot = gcroot_dir / clan_key_safe(flake_url)
+    clan_gcroot.mkdir(parents=True, exist_ok=True)
+    return clan_gcroot
+
+
 def user_history_file() -> Path:
     return user_config_dir() / "clan" / "history"
 
 
+def vm_state_dir(flake_url: str, vm_name: str) -> Path:
+    clan_key = clan_key_safe(str(flake_url))
+    return user_data_dir() / "clan" / "vmstate" / clan_key / vm_name
+
+
+def machines_dir(flake_dir: Path) -> Path:
+    return flake_dir / "machines"
+
+
+def specific_machine_dir(flake_dir: Path, machine: str) -> Path:
+    return machines_dir(flake_dir) / machine
+
+
 def module_root() -> Path:
     return Path(__file__).parent