From 8e791e4853ca2c7071d792891fb88e40f62a62e3 Mon Sep 17 00:00:00 2001 From: adlee-was-taken Date: Sat, 9 May 2026 11:12:26 -0400 Subject: [PATCH] refactor(cli): compress build_*_item with prompt_or_flag Plan B Phase 3 sub-step 2. Replaces the title.map(Ok).unwrap_or_else(|| prompt("Title"))? chain in all seven build_*_item functions with prompt_or_flag, and folds login's or_else(|| prompt_optional(...).ok().flatten()) for username and url into prompt_or_flag_optional. prompt_secret sites and the parse-on-Some-only patterns (expiry, dob, card kind, totp algorithm) stay as-is per spec. Removes the #[allow(dead_code)] attributes from the four helpers in prompt.rs now that callers exist. Co-Authored-By: Claude Opus 4.7 --- crates/relicario-cli/src/commands/add.rs | 20 ++++++++++---------- crates/relicario-cli/src/prompt.rs | 5 ----- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/crates/relicario-cli/src/commands/add.rs b/crates/relicario-cli/src/commands/add.rs index 6d58154..9f62d97 100644 --- a/crates/relicario-cli/src/commands/add.rs +++ b/crates/relicario-cli/src/commands/add.rs @@ -11,7 +11,7 @@ use anyhow::{Context, Result}; use crate::AddKind; use crate::parse::{base32_decode_lenient, guess_mime, parse_month_year}; -use crate::prompt::{prompt, prompt_optional, prompt_secret}; +use crate::prompt::{prompt, prompt_optional, prompt_or_flag, prompt_or_flag_optional, prompt_secret}; pub fn cmd_add(kind: AddKind) -> Result<()> { let vault = crate::session::UnlockedVault::unlock_interactive()?; @@ -69,9 +69,9 @@ fn build_login_item( use relicario_core::{Item, ItemCore}; use zeroize::Zeroizing; - let title = title.map(Ok).unwrap_or_else(|| prompt("Title"))?; - let username = username.or_else(|| prompt_optional("Username").ok().flatten()); - let url = url.or_else(|| prompt_optional("URL").ok().flatten()); + let title = prompt_or_flag(title, "Title", |s| Ok(s.to_string()))?; + let username = prompt_or_flag_optional(username, "Username", |s| Ok(s.to_string()))?; + let url = prompt_or_flag_optional(url, "URL", |s| Ok(s.to_string()))?; let parsed_url = match url { Some(s) => Some(url::Url::parse(&s).with_context(|| format!("invalid URL: {s}"))?), None => None, @@ -115,7 +115,7 @@ fn build_secure_note_item( use relicario_core::{Item, ItemCore}; use zeroize::Zeroizing; - let title = title.map(Ok).unwrap_or_else(|| prompt("Title"))?; + let title = prompt_or_flag(title, "Title", |s| Ok(s.to_string()))?; let body = if body_prompt { eprintln!("Enter note body; end with Ctrl-D on a blank line:"); let mut s = String::new(); @@ -144,7 +144,7 @@ fn build_identity_item( use relicario_core::item_types::IdentityCore; use relicario_core::{Item, ItemCore}; - let title = title.map(Ok).unwrap_or_else(|| prompt("Title"))?; + let title = prompt_or_flag(title, "Title", |s| Ok(s.to_string()))?; let dob = match date_of_birth { Some(s) => Some(chrono::NaiveDate::parse_from_str(&s, "%Y-%m-%d") .with_context(|| format!("invalid date {s} (expected YYYY-MM-DD)"))?), @@ -170,7 +170,7 @@ fn build_card_item( use relicario_core::{Item, ItemCore}; use zeroize::Zeroizing; - let title = title.map(Ok).unwrap_or_else(|| prompt("Title"))?; + let title = prompt_or_flag(title, "Title", |s| Ok(s.to_string()))?; let number = Zeroizing::new(prompt_secret("Card number: ")?); let cvv = Zeroizing::new(prompt_secret("CVV (blank to skip): ")?); let cvv = if cvv.is_empty() { None } else { Some(cvv) }; @@ -209,7 +209,7 @@ fn build_key_item( use relicario_core::{Item, ItemCore}; use zeroize::Zeroizing; - let title = title.map(Ok).unwrap_or_else(|| prompt("Title"))?; + let title = prompt_or_flag(title, "Title", |s| Ok(s.to_string()))?; eprintln!("Paste key material; end with Ctrl-D on a blank line:"); let mut key_material = String::new(); std::io::Read::read_to_string(&mut std::io::stdin(), &mut key_material)?; @@ -236,7 +236,7 @@ fn build_document_item( use relicario_core::{encrypt_attachment, AttachmentRef, Item, ItemCore}; use std::fs; - let title = title.map(Ok).unwrap_or_else(|| prompt("Title"))?; + let title = prompt_or_flag(title, "Title", |s| Ok(s.to_string()))?; let bytes = fs::read(&file) .with_context(|| format!("failed to read {}", file.display()))?; let caps = vault.load_settings()?.attachment_caps; @@ -285,7 +285,7 @@ fn build_totp_item( use relicario_core::{Item, ItemCore}; use zeroize::Zeroizing; - let title = title.map(Ok).unwrap_or_else(|| prompt("Title"))?; + let title = prompt_or_flag(title, "Title", |s| Ok(s.to_string()))?; let secret_b32 = match secret { Some(s) => s, None => prompt_secret("TOTP secret (base32): ")?, diff --git a/crates/relicario-cli/src/prompt.rs b/crates/relicario-cli/src/prompt.rs index 655a90d..6f3e52e 100644 --- a/crates/relicario-cli/src/prompt.rs +++ b/crates/relicario-cli/src/prompt.rs @@ -80,8 +80,6 @@ pub(crate) fn prompt_yesno(label: &str) -> Result { Ok(matches!(s.trim().to_ascii_lowercase().as_str(), "y" | "yes")) } -// dead_code allowed until sub-step 2 wires these into commands/add.rs. -#[allow(dead_code)] pub(crate) fn prompt_or_flag( flag: Option, label: &str, @@ -92,7 +90,6 @@ pub(crate) fn prompt_or_flag( prompt_or_flag_with_reader(flag, label, parser, &mut reader) } -#[allow(dead_code)] pub(crate) fn prompt_or_flag_optional( flag: Option, label: &str, @@ -103,7 +100,6 @@ pub(crate) fn prompt_or_flag_optional( prompt_or_flag_optional_with_reader(flag, label, parser, &mut reader) } -#[allow(dead_code)] pub(crate) fn prompt_or_flag_with_reader( flag: Option, label: &str, @@ -117,7 +113,6 @@ pub(crate) fn prompt_or_flag_with_reader( parser(&line) } -#[allow(dead_code)] pub(crate) fn prompt_or_flag_optional_with_reader( flag: Option, label: &str,