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

chore: Pass refrence of either to utils::vault_by_index_or_name function

Browse source 
Signed-off-by: Awiteb <a@4rs.nl>
This commit is contained in:
Awiteb 2024-08-20 14:16:21 +00:00
parent ad3dc025a9
commit aee33f819c
Signed by: awiteb
GPG key ID: 3F6B55640AA6682F
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/cli/edit_command.rs
View file

@ -75,7 +75,7 @@ pub struct Edit {
impl LprsCommand for Edit { impl LprsCommand for Edit {
fn run(self, mut vault_manager: Vaults) -> LprsResult<()> { fn run(self, mut vault_manager: Vaults) -> LprsResult<()> {
let vault = match utils::vault_by_index_or_name(self.location, &mut vault_manager.vaults) { let vault = match utils::vault_by_index_or_name(&self.location, &mut vault_manager.vaults) {
Ok((_, v)) => v, Ok((_, v)) => v,
Err(err) => { Err(err) => {
if self.force { if self.force {

2
src/cli/get_command.rs
View file

@ -112,7 +112,7 @@ pub struct Get {
impl LprsCommand for Get { impl LprsCommand for Get {
fn run(self, mut vault_manager: Vaults) -> LprsResult<()> { fn run(self, mut vault_manager: Vaults) -> LprsResult<()> {
let (index, vault) = let (index, vault) =
utils::vault_by_index_or_name(self.location, &mut vault_manager.vaults)?; utils::vault_by_index_or_name(&self.location, &mut vault_manager.vaults)?;
if let Some(field) = self.field { if let Some(field) = self.field {
if field == VaultGetField::Index { if field == VaultGetField::Index {

11
src/utils.rs
View file

@ -244,16 +244,17 @@ pub fn prompt_custom(
/// ///
/// ## Errors /// ## Errors
/// - If there is no vault with the given index or name /// - If there is no vault with the given index or name
pub fn vault_by_index_or_name( pub fn vault_by_index_or_name<'v>(
location: Either<NonZeroUsize, String>, location: &Either<NonZeroUsize, String>,
vaults: &mut [Vault], vaults: &'v mut [Vault],
) -> LprsResult<(usize, &mut Vault)> { ) -> LprsResult<(usize, &'v mut Vault)> {
let idx = location let idx = location
.as_ref()
.map_right(|name| { .map_right(|name| {
vaults vaults
.iter() .iter()
.enumerate() .enumerate()
.find_map(|(idx, v)| (v.name == name).then_some(idx)) .find_map(|(idx, v)| (&v.name == name).then_some(idx))
.ok_or_else(|| { .ok_or_else(|| {
LprsError::Other(format!("There is no vault with the given name `{name}`")) LprsError::Other(format!("There is no vault with the given name `{name}`"))
}) })