Added --no-confirm

Author: totokaka

mcman/mcman.py

@@ -236,6 +236,10 @@ def main():
         default=80,
         const=-10,
         help='How many entries that should be displayed, from the bottom')
+    group.add_argument(
+        '--no-confirm',
+        action='store_true',
+        help='Do not wait for confirmation, just proceede.')
 
     # The top level command
     parser = argparse.ArgumentParser(

mcman/plugins.py

@@ -224,7 +224,7 @@ def download(self):
                   filled_prefix=False)
 
         self.prnt('', False, False)
-        if utils.ask('Continue to download?'):
+        if utils.ask('Continue to download?', skip=self.args.no_confirm):
             prefix_format = '({{part:>{}}}/{{total}}) '.format(
                 len(str(len(plugins))))
 
@@ -273,7 +273,7 @@ def update(self):
                   filled_prefix=False)
         self.prnt('', False, False)
 
-        if utils.ask('Continue to update?'):
+        if utils.ask('Continue to update?', skip=self.args.no_confirm):
             prefix_format = '({{part:>{}}}/{{total}}) '.format(
                 len(str(len(to_update))))
 

mcman/servers.py

@@ -5,7 +5,7 @@
 # Imports from dependencies:
 import spacegdn
 # Imports from mcman:
-from mcman.utils import list_names, download, ask, checksum_file
+from mcman import utils
 
 
 class Servers(object):
@@ -58,10 +58,13 @@ def error(self, error):
     def prnt_result(self, result):
         """ Print result. """
         self.prnt('Results:')
+        self.prnt('', False, False)
         if len(result) > 0:
-            self.prnt('    {}'.format(list_names(result)), filled_prefix=False)
+            self.prnt('    {}'.format(utils.list_names(result)),
+                      filled_prefix=False)
         else:
             self.prnt('    No results...', filled_prefix=False)
+        self.prnt('', False, False)
 
     def servers(self):
         """ List servers. """
@@ -185,17 +188,17 @@ def download(self):
                   filled_prefix=False)
         self.prnt('', False, False)
 
-        if ask('Continue to download?'):
-            download(build['url'], file_name=self.args.output,
-                     checksum=build['checksum'], prefix=' '*4)
+        if utils.ask('Continue to download?', skip=self.args.no_confirm):
+            utils.download(build['url'], file_name=self.args.output,
+                           checksum=build['checksum'], prefix=' '*4)
             self.prnt('', False, False)
             self.prnt('Done!', prefix=False)
 
     def identify(self):
         """ Identify what server a jar is. """
         self.prnt('Calculating checksum of `{}`'.format(self.args.jar.name))
 
-        checksum = checksum_file(self.args.jar)
+        checksum = utils.checksum_file(self.args.jar)
         self.args.jar.close()
 
         self.prnt('Finding build on SpaceGDN')

mcman/utils.py

@@ -167,11 +167,15 @@ def extract_file(zipped, file, dest):
             dest.write(content)
 
 
-def ask(question, want_yes=True):
+def ask(question, want_yes=True, skip=False):
     """ Ask user for confirmation. """
     print(question, end=' [Y/n]: ' if want_yes else ' [y/N]: ')
-    answer = input()
-    if len(answer) == 0:
-        return want_yes
+    if skip:
+        print('y')
+        return True
     else:
-        return 'y' in answer.lower()
+        answer = input()
+        if len(answer) == 0:
+            return want_yes
+        else:
+            return 'y' in answer.lower()