Merge pull request #14 from bergercookie/master

Add show-only subcommand in CLI + Fish completion file

contrib/totp-cli-completion.fish

@@ -0,0 +1,9 @@
+# subcommands
+complete -xc totp -n '__fish_use_subcommand' -a show -d 'Show the current TOTP token for a registered entry'
+complete -xc totp -n '__fish_use_subcommand' -a add -d 'Add a new TOTP entry to the database'
+
+complete -xc totp -n '__fish_seen_subcommand_from show' -a '-n --nocopy' -d 'Show TOKEN but don\'t copy to clipboard'
+
+# 2FA codes
+test -z "$PASSWORD_STORE_DIR"; and set PASSWORD_STORE_DIR "$HOME/.password-store"
+complete -xc totp -a '(command ls $PASSWORD_STORE_DIR/2fa)' -d "2FA code"

totp/__init__.py

@@ -128,7 +128,7 @@ def normalize_secret(secret):
     return s
 
 
-def generate_token(path, seconds=0):
+def generate_token(path, seconds=0, to_clipboard=True):
     """Generate the TOTP token for the given path and the given time offset"""
     import time
     clock = time.time() + float(seconds)
@@ -145,7 +145,9 @@ def generate_token(path, seconds=0):
                                  clock=clock)
 
     print(token.decode())
-    copy_to_clipboard(token)
+
+    if to_clipboard:
+        copy_to_clipboard(token)
 
 
 def parse_otpauth_uri(uri):

totp/cli.py

@@ -108,13 +108,17 @@ def add_uri(path, uri):
         metavar='SECONDS',
         default=0,
         help='offset the clock by the given number of seconds'),
+    argument(
+        '-n', '--nocopy',
+        action="store_true",
+        help='Do not copy the token, only show it.'),
     argument(
         'identifier',
         help='the identifier by which the key can be found under the \'2fa\' folder'),
     description='Show the current TOTP token for a registered entry.',
     help='(default action) show the current TOTP token for a registered entry')
 def _cmd_show(args):
-    totp.generate_token(args.identifier, seconds=args.offset_seconds)
+    totp.generate_token(args.identifier, seconds=args.offset_seconds, to_clipboard=not args.nocopy)
 
 if __name__ == '__main__':
     run()