clean up copy feature

Author: jakeswenson

README.md

@@ -13,8 +13,9 @@ cargo install otpcli
 ```
 
 ## Features
-- **[DEFAULT]** `copy`: build with copy to [clipboard](https://crates.io/crates/clipboard) support. Adds a `--copy` option 
-- **[DEFAULT]** `keychain`: build with secure secret storage support using [`keyring`](https://crates.io/crates/keyring)
+- **[DEFAULT]** `copy`: build with copy to [clipboard](https://crates.io/crates/clipboard) support. Adds a `--copy` cli option.
+- **[DEFAULT]** `keychain`: build with secure secret storage support using [`keyring`](https://crates.io/crates/keyring).
+- `rsa_stoken`: add in `stoken` support using the stoken crate.
 
 The `copy` feature uses [clipboard](https://crates.io/crates/clipboard) 
 and that requires a X11 on linux to access the clipboard
@@ -42,7 +43,7 @@ SUBCOMMANDS:
     delete                 Add/Update a new TOTP secret
     generate               Generate a token
     help                   Prints this message or the help of the given subcommand(s)
-    import                 Import an RSAToken into otpcli
+    import                 Import an RSAToken into otpcli (if built with the stoken flag)
     list                   Add/Update a new TOTP secret
     migrate-to-keychain    Migrate secrets stored in the config to be stored in the keychain
 ```

src/otpcli/cli.rs

@@ -27,6 +27,13 @@ pub struct Options {
     pub copy_to_clipboard: bool,
 }
 
+impl Options {
+    #[cfg(feature = "copy")]
+    pub fn copy_to_clipboard(&self) -> bool {
+        self.copy_to_clipboard
+    }
+}
+
 #[derive(StructOpt, Clone)]
 pub enum Command {
     /// Add/Update a new TOTP secret

src/otpcli/main.rs

@@ -57,11 +57,6 @@ fn copy_to_clipboard(code: &str) -> TotpResult<()> {
     Ok(())
 }
 
-#[cfg(not(feature = "copy"))]
-fn copy_to_clipboard(_code: &str) -> TotpResult<()> {
-    Ok(())
-}
-
 fn generate_token(opts: Options, config: Config, name: String) -> TotpResult<()> {
     let code = match otp::token(&name, config) {
         Ok(token) => token,
@@ -76,10 +71,9 @@ fn generate_token(opts: Options, config: Config, name: String) -> TotpResult<()>
         }
     };
 
-    if cfg!(feature = "copy") {
-        if opts.copy_to_clipboard {
-            copy_to_clipboard(&code)?;
-        }
+    #[cfg(feature = "copy")]
+    if opts.copy_to_clipboard() {
+        copy_to_clipboard(&code)?;
     }
 
     if opts.end_with_newline {

src/totp.rs

@@ -30,11 +30,11 @@ pub enum TokenAlgorithm {
 impl Copy for TokenAlgorithm {}
 
 trait AsDigest {
-    fn new(&self) -> Box<dyn Digest>;
+    fn as_digest(&self) -> Box<dyn Digest>;
 }
 
 impl AsDigest for TokenAlgorithm {
-    fn new(&self) -> Box<dyn Digest> {
+    fn as_digest(&self) -> Box<dyn Digest> {
         Box::new(match self {
             TokenAlgorithm::TotpSha1 => Sha1::new(),
             #[cfg(feature = "rsa_stoken")]