From d76ab4313631ccca036d45a438bf28de63d59632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 21 Nov 2023 14:25:51 +0100 Subject: [PATCH] drop join from cli --- pkgs/clan-cli/clan_cli/__init__.py | 5 +--- pkgs/clan-cli/clan_cli/join/__init__.py | 35 ------------------------- 2 files changed, 1 insertion(+), 39 deletions(-) delete mode 100644 pkgs/clan-cli/clan_cli/join/__init__.py diff --git a/pkgs/clan-cli/clan_cli/__init__.py b/pkgs/clan-cli/clan_cli/__init__.py index 0f42ab0a2..597955023 100644 --- a/pkgs/clan-cli/clan_cli/__init__.py +++ b/pkgs/clan-cli/clan_cli/__init__.py @@ -5,7 +5,7 @@ from pathlib import Path from types import ModuleType from typing import Any, Optional, Sequence -from . import config, flakes, join, machines, secrets, vms, webui +from . import config, flakes, machines, secrets, vms, webui from .custom_logger import setup_logging from .dirs import get_clan_flake_toplevel from .ssh import cli as ssh_cli @@ -69,9 +69,6 @@ def create_parser(prog: Optional[str] = None) -> argparse.ArgumentParser: ) flakes.register_parser(parser_flake) - parser_join = subparsers.add_parser("join", help="join a remote clan") - join.register_parser(parser_join) - parser_config = subparsers.add_parser("config", help="set nixos configuration") config.register_parser(parser_config) diff --git a/pkgs/clan-cli/clan_cli/join/__init__.py b/pkgs/clan-cli/clan_cli/join/__init__.py deleted file mode 100644 index 6b1344edd..000000000 --- a/pkgs/clan-cli/clan_cli/join/__init__.py +++ /dev/null @@ -1,35 +0,0 @@ -# !/usr/bin/env python3 -import argparse -import subprocess -import urllib -from typing import Optional - - -def join(args: argparse.Namespace) -> None: - # start webui in background - uri = args.flake_uri.removeprefix("clan://") - subprocess.run( - ["clan", "--debug", "webui", f"/join?flake={urllib.parse.quote_plus(uri)}"], - # stdout=sys.stdout, - # stderr=sys.stderr, - ) - print(f"joined clan {args.flake_uri}") - - -# takes a (sub)parser and configures it -def register_parser( - parser: Optional[argparse.ArgumentParser], -) -> None: - if parser is None: - parser = argparse.ArgumentParser( - description="join a remote clan", - ) - - # inject callback function to process the input later - parser.set_defaults(func=join) - - parser.add_argument( - "flake_uri", - help="flake uri to join", - type=str, - )