Feat: change default and test params; use return status

1 files changed, 11 insertions, 7 deletions

diff --git a/csv-sampler.py b/csv-sampler.py
index 35d82db..fa861a8 100755
--- a/csv-sampler.py
+++ b/csv-sampler.py
@@ -66,7 +66,11 @@ def cmdline():
     :return: Command line arguments.
     """
 
-    basename = os.path.basename(__file__)
+    # Defaults
+    basename           = os.path.basename(__file__)
+    rows_per_iteration = 1024
+    iterations         = 1024
+    progress           = True
 
     # Parse CLI
     #examples  = "Examples:\n\t" + basename + " --no-progress \n"
@@ -76,23 +80,23 @@ def cmdline():
                                      epilog=epilog,
                                      formatter_class=argparse.RawDescriptionHelpFormatter,)
 
-    parser.add_argument('outfile',  nargs=1, help='CSV output file name')
+    parser.add_argument('outfile', nargs=1, help='CSV output file name')
 
     parser.add_argument('--rows_per_iteration', dest='rows_per_iteration',
-            type=int, help='Rows per iteration, defaults to 1000')
+            type=int, help='Rows per iteration, defaults to ' + str(rows_per_iteration))
 
     parser.add_argument('--iterations', dest='iterations',
-            help='Number of iterations, defaults to 1000')
+            help='Number of iterations, defaults to ' + str(iterations))
 
     parser.add_argument('--progress', dest='progress', action='store_true',
-                        help='Enable progress bar.')
+                        help='Enable progress bar, defaults to ' + str(progress))
 
     parser.add_argument('--no-progress', dest='progress', action='store_false',
                         help='Disable progress bar.')
 
     # Add default values and get args
-    parser.set_defaults(rows_per_iteration=1000)
-    parser.set_defaults(iterations=1000)
+    parser.set_defaults(rows_per_iteration=rows_per_iteration)
+    parser.set_defaults(iterations=iterations)
     parser.set_defaults(progress=True)
     args = parser.parse_args()