Resolve "Keys clean subcommand : Indicate to Structopt that the user must indicate which keypair to delete"

Closes #108 (closed)

lib/core/core/src/commands/keys.rs

@@ -21,6 +21,7 @@ use crate::DursCore;
 use clear_on_drop::clear::Clear;
 use durs_conf::keys::*;
 use durs_conf::DuRsConf;
+use strum_macros::EnumString;
 
 #[derive(StructOpt, Debug, Clone)]
 #[structopt(
@@ -94,17 +95,29 @@ pub enum ModifySubCommand {
 #[derive(StructOpt, Debug, Copy, Clone)]
 /// ClearOpt
 pub struct ClearOpt {
-    #[structopt(short = "m", long = "member")]
-    /// True if we change member key
-    pub member: bool,
-
-    #[structopt(short = "n", long = "network")]
-    /// True if we change network key
-    pub network: bool,
-
-    #[structopt(short = "a", long = "all")]
-    /// True if we change member and network key
-    pub all: bool,
+    /// Key to clear: member, network or all (both member and network)
+    key: KeyKind,
+}
+#[derive(Debug, Copy, Clone, PartialEq, EnumString)]
+#[strum(serialize_all = "kebab_case")]
+/// KeyKind
+pub enum KeyKind {
+    /// Member key
+    MEMBER,
+    /// Network key
+    NETWORK,
+    /// Both Member and Network keys
+    ALL,
+}
+impl KeyKind {
+    /// Returns if key kind is member
+    pub fn is_member(self) -> bool {
+        self == KeyKind::MEMBER || self == KeyKind::ALL
+    }
+    /// Returns if key kind is network
+    pub fn is_network(self) -> bool {
+        self == KeyKind::NETWORK || self == KeyKind::ALL
+    }
 }
 
 #[derive(StructOpt, Debug, Clone)]
@@ -169,8 +182,8 @@ impl DursExecutableCoreCommand for KeysOpt {
             },
             KeysSubCommand::Clear(clear_opt) => {
                 let new_keypairs = clear_keys(
-                    clear_opt.network || clear_opt.all,
-                    clear_opt.member || clear_opt.all,
+                    clear_opt.key.is_network(),
+                    clear_opt.key.is_member(),
                     keypairs,
                 );
                 save_keypairs(profile_path, &keypairs_file, new_keypairs)