From 21429104a360347edf334bb33db775454f537f6d Mon Sep 17 00:00:00 2001 From: Awiteb Date: Thu, 25 Apr 2024 07:42:06 +0300 Subject: [PATCH] chore: Rename `RunCommand` trait to `LprsCommand` --- src/cli/add_command.rs | 4 ++-- src/cli/clean_command.rs | 4 ++-- src/cli/edit_command.rs | 4 ++-- src/cli/export_command.rs | 4 ++-- src/cli/gen_command.rs | 4 ++-- src/cli/import_command.rs | 4 ++-- src/cli/list_command.rs | 4 ++-- src/cli/mod.rs | 2 +- src/cli/remove_command.rs | 4 ++-- src/macros.rs | 8 ++++---- src/traits.rs | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/cli/add_command.rs b/src/cli/add_command.rs index ce3c8df..1d6d86f 100644 --- a/src/cli/add_command.rs +++ b/src/cli/add_command.rs @@ -18,7 +18,7 @@ use clap::Args; use crate::{ vault::{vault_state::*, Vault, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] @@ -31,7 +31,7 @@ pub struct Add { password: Option>, } -impl RunCommand for Add { +impl LprsCommand for Add { fn run(mut self, mut vault_manager: Vaults) -> LprsResult<()> { if self.vault_info.username.is_none() && self.password.is_none() diff --git a/src/cli/clean_command.rs b/src/cli/clean_command.rs index 11ae7ec..989bf1d 100644 --- a/src/cli/clean_command.rs +++ b/src/cli/clean_command.rs @@ -20,14 +20,14 @@ use clap::Args; use crate::{ vault::{vault_state::*, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] #[command(author, version, about, long_about = None)] pub struct Clean {} -impl RunCommand for Clean { +impl LprsCommand for Clean { fn run(self, vault_manager: Vaults) -> LprsResult<()> { fs::write(vault_manager.vaults_file, "[]").map_err(LprsError::Io) } diff --git a/src/cli/edit_command.rs b/src/cli/edit_command.rs index 7c594f9..8e1052f 100644 --- a/src/cli/edit_command.rs +++ b/src/cli/edit_command.rs @@ -20,7 +20,7 @@ use clap::Args; use crate::{ vault::{vault_state::*, Vault, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] @@ -46,7 +46,7 @@ pub struct Edit { note: Option, } -impl RunCommand for Edit { +impl LprsCommand for Edit { fn run(self, mut vault_manager: Vaults) -> LprsResult<()> { let index = self.index.get() as usize; diff --git a/src/cli/export_command.rs b/src/cli/export_command.rs index 34b7abf..fd46e81 100644 --- a/src/cli/export_command.rs +++ b/src/cli/export_command.rs @@ -20,7 +20,7 @@ use clap::Args; use crate::{ vault::{vault_state::*, BitWardenPasswords, Format, Vault, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] @@ -33,7 +33,7 @@ pub struct Export { format: Format, } -impl RunCommand for Export { +impl LprsCommand for Export { fn run(self, vault_manager: Vaults) -> LprsResult<()> { if self .path diff --git a/src/cli/gen_command.rs b/src/cli/gen_command.rs index f35f92f..382d94a 100644 --- a/src/cli/gen_command.rs +++ b/src/cli/gen_command.rs @@ -20,7 +20,7 @@ use clap::Args; use crate::{ vault::{vault_state::*, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] @@ -44,7 +44,7 @@ pub struct Gen { symbols: bool, } -impl RunCommand for Gen { +impl LprsCommand for Gen { fn run(self, _vault_manager: Vaults) -> LprsResult<()> { if self.uppercase || self.lowercase || self.numbers || self.symbols { println!( diff --git a/src/cli/import_command.rs b/src/cli/import_command.rs index f9de214..4bdb5f7 100644 --- a/src/cli/import_command.rs +++ b/src/cli/import_command.rs @@ -20,7 +20,7 @@ use clap::Args; use crate::{ vault::{vault_state::*, BitWardenPasswords, Format, Vault, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] @@ -34,7 +34,7 @@ pub struct Import { format: Format, } -impl RunCommand for Import { +impl LprsCommand for Import { fn run(self, mut vault_manager: Vaults) -> LprsResult<()> { if self.path.exists() { if self diff --git a/src/cli/list_command.rs b/src/cli/list_command.rs index 16cfc63..d0f0cc1 100644 --- a/src/cli/list_command.rs +++ b/src/cli/list_command.rs @@ -20,7 +20,7 @@ use clap::Args; use crate::{ vault::{vault_state::*, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] @@ -49,7 +49,7 @@ pub struct List { regex: bool, } -impl RunCommand for List { +impl LprsCommand for List { fn run(self, vault_manager: Vaults) -> LprsResult<()> { if vault_manager.vaults.is_empty() { return Err(LprsError::Other( diff --git a/src/cli/mod.rs b/src/cli/mod.rs index 65298e2..933f75b 100644 --- a/src/cli/mod.rs +++ b/src/cli/mod.rs @@ -18,7 +18,7 @@ use std::path::PathBuf; use clap::Parser; -use crate::{utils, vault::Vaults, LprsResult, RunCommand}; +use crate::{utils, vault::Vaults, LprsCommand, LprsResult}; pub mod add_command; pub mod clean_command; diff --git a/src/cli/remove_command.rs b/src/cli/remove_command.rs index 36e8ebb..af0ef12 100644 --- a/src/cli/remove_command.rs +++ b/src/cli/remove_command.rs @@ -20,7 +20,7 @@ use clap::Args; use crate::{ vault::{vault_state::*, Vaults}, - LprsError, LprsResult, RunCommand, + LprsCommand, LprsError, LprsResult, }; #[derive(Debug, Args)] @@ -34,7 +34,7 @@ pub struct Remove { force: bool, } -impl RunCommand for Remove { +impl LprsCommand for Remove { fn run(self, mut vault_manager: Vaults) -> LprsResult<()> { let index = (self.index.get() - 1) as usize; if index > vault_manager.vaults.len() { diff --git a/src/macros.rs b/src/macros.rs index a753c97..aab1c8c 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -14,10 +14,10 @@ // You should have received a copy of the GNU General Public License // along with this program. If not, see . -/// Creates commands macro, to create the `Commands` enum and impl `RunCommand` to it. +/// Creates commands macro, to create the `Commands` enum and impl `LprsCommand` to it. /// /// ### Notes: -/// The `$command` must impl `RunCommand` trait +/// The `$command` must impl `LprsCommand` trait /// /// ### Example: /// ```rust @@ -37,7 +37,7 @@ /// Some(SomeArgs), /// } /// -/// impl crate::RunCommand for TestCommands { +/// impl crate::LprsCommand for TestCommands { /// fn run( /// &self, /// vault_manager: crate::vault::Vaults, @@ -62,7 +62,7 @@ macro_rules! create_commands { } #[automatically_derived] - impl $crate::RunCommand for $enum_name{ + impl $crate::LprsCommand for $enum_name{ fn run(self, vault_manager: $crate::vault::Vaults<$crate::vault::vault_state::Plain>) -> $crate::LprsResult<()> { match self { $( diff --git a/src/traits.rs b/src/traits.rs index cb0882c..c48b693 100644 --- a/src/traits.rs +++ b/src/traits.rs @@ -19,7 +19,7 @@ use crate::{ LprsResult, }; -/// Trait to run the command -pub trait RunCommand { +/// Trait to work with the commands +pub trait LprsCommand { fn run(self, vault_manager: Vaults) -> LprsResult<()>; }