From b8264f8fd2150bf34306b5f88be7e9c9ae76013a Mon Sep 17 00:00:00 2001 From: lassulus Date: Mon, 22 Apr 2024 20:13:17 +0200 Subject: [PATCH] clan-cli ssh: --json can be file or str --- pkgs/clan-cli/clan_cli/ssh/cli.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/ssh/cli.py b/pkgs/clan-cli/clan_cli/ssh/cli.py index 9288ca0d5..d793d806f 100644 --- a/pkgs/clan-cli/clan_cli/ssh/cli.py +++ b/pkgs/clan-cli/clan_cli/ssh/cli.py @@ -3,6 +3,7 @@ import json import logging import socket import subprocess +from pathlib import Path 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: if args.json: - with open(args.json) as file: - ssh_data = json.load(file) + json_file = Path(args.json) + 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) elif args.png: ssh_data = json.loads(qrcode_scan(args.png))