Small improvements to interface and help text

[munter.git] / munter / munter.py

diff --git a/munter/munter.py b/munter/munter.py
index 7179e5272ebcef59572a1d5317d6297375567822..234ec9bb5027a6ce2052db5bf60d91bc0df68f8d 100644 (file)
--- a/munter/munter.py
+++ b/munter/munter.py
@@ -25,7 +25,7 @@ rates = {
 unit_choices = ['metric', 'imperial']
 travel_mode_choices = rates.keys()
 
 unit_choices = ['metric', 'imperial']
 travel_mode_choices = rates.keys()
 

-def time_calc(distance, elevation, rate, units):
+def time_calc(distance, elevation, rate='uphill', units='imperial'):

     retval = {}
 
     if units not in unit_choices:
     retval = {}
 
     if units not in unit_choices:


@@ -80,7 +80,8 @@ def print_pretty_estimate(est):
     print("\t └───────────────────────────────┘\n")
 
 def get_parser():
     print("\t └───────────────────────────────┘\n")
 
 def get_parser():

-    parser = argparse.ArgumentParser(description='Munter Time Calculation')
+    parser = argparse.ArgumentParser(description='Implementation of '
+        'the Munter time calculation')

 
     parser.add_argument('--distance',
         '-d',
 
     parser.add_argument('--distance',
         '-d',


@@ -99,7 +100,7 @@ def get_parser():
         type=str,
         default='uphill',
         choices=travel_mode_choices, required=False,
         type=str,
         default='uphill',
         choices=travel_mode_choices, required=False,

-        help='Travel mode (flat, by default)')
+        help='Travel mode (uphill, by default)')

 
     parser.add_argument('--units',
         '-u',
 
     parser.add_argument('--units',
         '-u',


@@ -113,7 +114,8 @@ def get_parser():
         '-p',
         action='store_true',
         default=False,
         '-p',
         action='store_true',
         default=False,

-        required=False);
+        required=False,
+        help="Make output pretty");

 
     return parser
 
 
     return parser
 


@@ -126,7 +128,8 @@ def main():
     units = opts.units
     travel_mode = opts.travel_mode
 
     units = opts.units
     travel_mode = opts.travel_mode
 

-    time_estimate = time_calc(distance, elevation, travel_mode, units=units)
+    time_estimate = time_calc(distance=distance, elevation=elevation,
+        rate=travel_mode, units=units)

 
     if opts.pretty:
         print_pretty_estimate(time_estimate)
 
     if opts.pretty:
         print_pretty_estimate(time_estimate)