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

clan-cli ssh: --json can be file or str

Browse Source
This commit is contained in:
lassulus
2024-04-22 20:13:17 +02:00
parent 4a74b04cc6
commit b8264f8fd2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/clan-cli/clan_cli/ssh/cli.py
View File

@@ -3,6 +3,7 @@ import json
import logging import logging
import socket import socket
import subprocess import subprocess
from pathlib import Path
from ..nix import nix_shell from ..nix import nix_shell
@@ -97,8 +98,11 @@ def connect_ssh_from_json(ssh_data: dict[str, str]) -> None:
def main(args: argparse.Namespace) -> None: def main(args: argparse.Namespace) -> None:
if args.json: if args.json:
with open(args.json) as file: json_file = Path(args.json)
ssh_data = json.load(file) if json_file.is_file():
ssh_data = json.loads(json_file.read_text())
else:
ssh_data = json.loads(args.json)
connect_ssh_from_json(ssh_data) connect_ssh_from_json(ssh_data)
elif args.png: elif args.png:
ssh_data = json.loads(qrcode_scan(args.png)) ssh_data = json.loads(qrcode_scan(args.png))