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

refactor: Change the way of clap commands

Browse source
This commit is contained in:
Awiteb 2024-04-30 00:40:48 +03:00
parent c8139a1bbc
commit 9e20e17b3b
Signed by: awiteb
GPG key ID: 3F6B55640AA6682F
2 changed files with 36 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/cli/mod.rs
View file

@ -18,7 +18,7 @@ use std::path::PathBuf;
use clap::Parser;
use crate::{utils, vault::Vaults, LprsCommand, LprsResult};
use crate::{impl_commands, utils, vault::Vaults, LprsCommand, LprsResult};
pub mod add_command;
pub mod clean_command;
@ -29,17 +29,28 @@ pub mod import_command;
pub mod list_command;
pub mod remove_command;
crate::create_commands!(
enum Commands
"Add new vault", Add => add_command::Add
"Remove vault", Remove => remove_command::Remove
"List your vaults and search", List => list_command::List
"Clean the vaults file", Clean => clean_command::Clean
"Edit the vault content", Edit => edit_command::Edit
"Generate a password", Gen => gen_command::Gen
"Export the vaults", Export => export_command::Export
"Import vaults", Import => import_command::Import
);
/// The lprs commands
#[derive(Debug, clap::Subcommand)]
pub enum Commands {
/// Add new vault
Add(add_command::Add),
/// Remove vault
Remove(remove_command::Remove),
/// List your vaults and search
List(list_command::List),
/// Clean the vaults file
Clean(clean_command::Clean),
/// Edit the vault content
Edit(edit_command::Edit),
/// Generate a password
Gen(gen_command::Gen),
/// Export the vaults
Export(export_command::Export),
/// Import vaults
Import(import_command::Import),
}
impl_commands!(Commands, Add Remove List Clean Edit Gen Export Import);
#[derive(Parser, Debug)]
#[command(author, version, about, long_about = None)]

36
src/macros.rs
View file

@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with this program. If not, see <https://www.gnu.org/licenses/gpl-3.0.html>.
/// Creates commands macro, to create the `Commands` enum and impl `LprsCommand` to it.
/// Impl `LprsCommand` to the given subcommand.
///
/// ### Notes:
/// The `$command` must impl `LprsCommand` trait
@ -22,21 +22,12 @@
/// ### Example:
/// ```rust
/// create_commands!(
/// enum TestCommands
/// "Test command", Test => TestArgs
/// "Do something", Some => SomeArgs
/// TestCommands,
/// Test Some
/// );
/// ```
/// #### Output
/// ```rust
/// ///The lprs commands
/// pub enum TestCommands {
/// ///Test command
/// Test(TestArgs),
/// ///Do something
/// Some(SomeArgs),
/// }
///
/// impl crate::LprsCommand for TestCommands {
/// fn run(
/// &self,
@ -47,20 +38,19 @@
/// Self::Some(command) => command.run(vault_manager),
/// }
/// }
///
/// fn validate_args(&self) -> crate::LprsResult<()> {
/// match self {
/// Self::Test(command) => command.validate_args(),
/// Self::Some(command) => command.validate_args(),
/// }
/// }
/// }
/// ```
#[macro_export]
macro_rules! create_commands {
(enum $enum_name: ident $($doc:tt, $varint: ident => $command: ty)+) => {
#[doc = "The lprs commands"]
#[derive(Debug, clap::Subcommand)]
pub enum $enum_name {
$(
#[doc = $doc]
$varint($command),
)+
}
macro_rules! impl_commands {
($enum_name: ident, $($varint: ident)+) => {
#[automatically_derived]
impl $crate::LprsCommand for $enum_name{
fn run(self, vault_manager: $crate::vault::Vaults<$crate::vault::vault_state::Plain>) -> $crate::LprsResult<()> {