awiteb/lprs
1
Fork 0
Code Issues 2 Pull requests Releases 3 Activity Actions

feat: Support removing multiple vaults in single command #66

Merged
awiteb merged 1 commit from awiteb/fix-57 into master 2024-08-20 19:04:53 +02:00 AGit
Conversation 0 Commits 1 Files changed 1 +23 -7
1 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/cli/remove_command.rs
View file

@ -19,14 +19,20 @@ use std::num::NonZeroUsize;
use clap::Args; use clap::Args;
use either::Either; use either::Either;
use crate::{clap_parsers::either_parser, utils, vault::Vaults, LprsCommand, LprsResult}; use crate::{
clap_parsers::either_parser,
utils,
vault::{Vault, Vaults},
LprsCommand,
LprsResult,
};
#[derive(Debug, Args)] #[derive(Debug, Args)]
/// Remove command, used to remove a vault from the vaults file /// Remove command, used to remove a vault from the vaults file
pub struct Remove { pub struct Remove {
/// The vault to remove, index or name /// The vaults to remove, index or name
#[arg(name = "INDEX-or-NAME", value_parser = either_parser::<NonZeroUsize, String>)] #[arg(name = "INDEX-or-NAME", value_parser = either_parser::<NonZeroUsize, String>)]
location: Either<NonZeroUsize, String>, locations: Vec<Either<NonZeroUsize, String>>,
/// Force remove, will not return error if there is no vault with the given /// Force remove, will not return error if there is no vault with the given
/// index or name /// index or name
@ -36,16 +42,26 @@ pub struct Remove {
impl LprsCommand for Remove { impl LprsCommand for Remove {
fn run(self, mut vault_manager: Vaults) -> LprsResult<()> { fn run(self, mut vault_manager: Vaults) -> LprsResult<()> {
let index = match utils::vault_by_index_or_name(self.location, &mut vault_manager.vaults) { let indexes = self
Ok((idx, _)) => idx, .locations
.iter()
.map(|location| {
utils::vault_by_index_or_name(location, &mut vault_manager.vaults)
.map(|(_, v)| v.clone())
})
.collect::<LprsResult<Vec<Vault>>>();
match indexes {
Ok(indexes) => vault_manager.vaults.retain(|v| !indexes.contains(v)),
Err(err) => { Err(err) => {
if self.force { if self.force {
log::warn!("Ignoring error: {err}");
return Ok(()); return Ok(());
} }
return Err(err); return Err(err);
} }
}; }
vault_manager.vaults.remove(index);
vault_manager.try_export() vault_manager.try_export()
} }
} }