cli.prompt_yes_no

Author: tony

Diff for: tmuxp/cli.py

@@ -79,6 +79,13 @@ def prompt_bool(name, default=False, yes_choices=None, no_choices=None):
             return False
 
 
+def prompt_yes_no(name, default=True):
+    return prompt_bool(name,
+                       default=default,
+                       yes_choices=['Y', 'y'],
+                       no_choices=['n']
+                       )
+
 def prompt_choices(name, choices, default=None, resolve=ascii_lowercase,
                    no_choice=('none',)):
     """
@@ -229,15 +236,15 @@ def load_workspace(config_file, args):
         builder.build()
 
         if 'TMUX' in os.environ:
-            if prompt_bool('Already inside TMUX, load session?'):
+            if prompt_yes_no('Already inside TMUX, load session?', default='Y'):
                 del os.environ['TMUX']
                 os.execl(tmux_bin, 'tmux', 'switch-client', '-t', sconfig[
                          'session_name'])
 
         os.execl(tmux_bin, 'tmux', 'attach-session', '-t', sconfig[
                  'session_name'])
     except exc.TmuxSessionExists as e:
-        attach_session = prompt_bool(e.message + ' Attach?')
+        attach_session = prompt_yes_no(e.message + ' Attach?', default='Y')
 
         if 'TMUX' in os.environ:
             del os.environ['TMUX']
@@ -401,26 +408,26 @@ def command_convert(args):
         return
 
     if 'json' in ext:
-        if prompt_bool('convert to <%s> to yaml?' % (fullfile)):
+        if prompt_yes_no('convert to <%s> to yaml?' % (fullfile), default='Y'):
             configparser = kaptan.Kaptan()
             configparser.import_config(configfile)
             newfile = fullfile.replace(ext, '.yaml')
             newconfig = configparser.export(
                 'yaml', indent=2, default_flow_style=False
             )
-            if prompt_bool('write config to %s?' % (newfile)):
+            if prompt_yes_no('write config to %s?' % (newfile), default='Y'):
                 buf = open(newfile, 'w')
                 buf.write(newconfig)
                 buf.close()
                 print('written new config to %s' % (newfile))
     elif 'yaml' in ext:
-        if prompt_bool('convert to <%s> to json?' % (fullfile)):
+        if prompt_yes_no('convert to <%s> to json?' % (fullfile), default='Y'):
             configparser = kaptan.Kaptan()
             configparser.import_config(configfile)
             newfile = fullfile.replace(ext, '.json')
             newconfig = configparser.export('json', indent=2)
             print(newconfig)
-            if prompt_bool('write config to <%s>?' % (newfile)):
+            if prompt_yes_no('write config to <%s>?' % (newfile), default='Y'):
                 buf = open(newfile, 'w')
                 buf.write(newconfig)
                 buf.close()