From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 671CDB9037 for ; Thu, 7 Dec 2023 13:51:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4B40DDEE9 for ; Thu, 7 Dec 2023 13:51:30 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 7 Dec 2023 13:51:29 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 79EF943465 for ; Thu, 7 Dec 2023 13:51:29 +0100 (CET) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Thu, 7 Dec 2023 13:51:25 +0100 Message-Id: <20231207125126.201502-2-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231207125126.201502-1-g.goller@proxmox.com> References: <20231207125126.201502-1-g.goller@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.153 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v4 proxmox 1/2] router: cli: added `ask_for_confirmation` helper X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 07 Dec 2023 12:51:30 -0000 Added `ask_for_confirmation` helper that outputs a prompt and lets the user confirm or deny it. Implemented to close #4763. Signed-off-by: Gabriel Goller --- proxmox-router/Cargo.toml | 1 + proxmox-router/src/cli/mod.rs | 46 ++++++++++++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/proxmox-router/Cargo.toml b/proxmox-router/Cargo.toml index c53ccd0..cd9140d 100644 --- a/proxmox-router/Cargo.toml +++ b/proxmox-router/Cargo.toml @@ -19,6 +19,7 @@ percent-encoding.workspace = true serde_json.workspace = true serde.workspace = true unicode-width ="0.1.8" +regex.workspace = true # cli: tokio = { workspace = true, features = [], optional = true } diff --git a/proxmox-router/src/cli/mod.rs b/proxmox-router/src/cli/mod.rs index 208df4a..2628538 100644 --- a/proxmox-router/src/cli/mod.rs +++ b/proxmox-router/src/cli/mod.rs @@ -12,7 +12,10 @@ //! - Ability to create interactive commands (using ``rustyline``) //! - Supports complex/nested commands -use std::collections::HashMap; +use std::{ + collections::HashMap, + io::{self, Write}, +}; use crate::ApiMethod; @@ -62,6 +65,47 @@ pub fn init_cli_logger(env_var_name: &str, default_log_level: &str) { .init(); } +pub enum DefaultAnswer { + Yes, + No, +} + +/// Prints a prompt to ask for confirmation +pub fn ask_for_confirmation(query: String, default: DefaultAnswer) -> Result { + let yesnoprompt: (char, char) = match default { + DefaultAnswer::Yes => ('Y', 'n'), + DefaultAnswer::No => ('y', 'N'), + }; + print!("{query} [{}/{}]: ", yesnoprompt.0, yesnoprompt.1); + + io::stdout().flush()?; + let stdin = io::stdin(); + let mut line = String::new(); + stdin.read_line(&mut line)?; + + use regex::Regex; + match default { + DefaultAnswer::Yes => { + // unwrap is okay, because this regex is correct + let no_regex: Regex = Regex::new("^[nN]").unwrap(); + if no_regex.is_match(line.trim()) { + Ok(false) + } else { + Ok(true) + } + } + DefaultAnswer::No => { + // unwrap is okay, because this regex is coorrect + let yes_regex: Regex = Regex::new("^[yY]").unwrap(); + if yes_regex.is_match(line.trim()) { + Ok(true) + } else { + Ok(false) + } + } + } +} + /// Define a simple CLI command. pub struct CliCommand { /// The Schema definition. -- 2.39.2