X-Git-Url: https://wylark.com/src/munter.git/blobdiff_plain/e8d14d51e3e6a0c11c58f93b92b2a6e052218339..363bc8c5115d6714444d1660ab4c386b442deda2:/munter/munter.py

diff --git a/munter/munter.py b/munter/munter.py
index 234ec9b..bfc286b 100644
--- a/munter/munter.py
+++ b/munter/munter.py
@@ -22,10 +22,18 @@ rates = {
     'bushwhacking': { 'rate': 2, 'direction': '↹' },
 }
 
+fitnesses = {
+    'slow': 1.2,
+    'average': 1,
+    'fast': .7,
+}
+
 unit_choices = ['metric', 'imperial']
 travel_mode_choices = rates.keys()
+fitness_choices = fitnesses.keys()
 
-def time_calc(distance, elevation, rate='uphill', units='imperial'):
+def time_calc(distance, elevation, fitness='average', rate='uphill',
+    units='imperial'):
     retval = {}
 
     if units not in unit_choices:
@@ -41,6 +49,8 @@ def time_calc(distance, elevation, rate='uphill', units='imperial'):
     unit_count = distance + (elevation / 100.0)
 
     retval['time'] = (distance + (elevation / 100.0)) / rates[rate]['rate']
+    retval['time'] = retval['time'] * fitnesses[fitness]
+
     retval['unit_count'] = unit_count
     retval['direction'] = rates[rate]['direction']
     retval['pace'] = rates[rate]['rate']
@@ -83,16 +93,19 @@ def get_parser():
     parser = argparse.ArgumentParser(description='Implementation of '
         'the Munter time calculation')
 
+    # No required args anymore, since -g overrides any requirement
     parser.add_argument('--distance',
         '-d',
+        default=0.0,
         type=float,
-        required=True,
+        required=False,
         help='Distance (in km, by default)')
 
     parser.add_argument('--elevation',
         '-e',
+        default=0.0,
         type=float,
-        required=True,
+        required=False,
         help='Elevation change (in m, by default)')
 
     parser.add_argument('--travel-mode',
@@ -102,6 +115,13 @@ def get_parser():
         choices=travel_mode_choices, required=False,
         help='Travel mode (uphill, by default)')
 
+    parser.add_argument('--fitness',
+        '-f',
+        type=str,
+        default='average',
+        choices=fitness_choices, required=False,
+        help='Fitness modifier (average, by default)')
+
     parser.add_argument('--units',
         '-u',
         type=str,
@@ -117,6 +137,13 @@ def get_parser():
         required=False,
         help="Make output pretty");
 
+    parser.add_argument('--gui',
+        '-g',
+        action='store_true',
+        default=False,
+        required=False,
+        help='Launch GUI mode (overrides --pretty)')
+
     return parser
 
 def main():
@@ -125,16 +152,23 @@ def main():
 
     distance = opts.distance
     elevation = opts.elevation
+    fitness = opts.fitness
     units = opts.units
     travel_mode = opts.travel_mode
+    pretty = opts.pretty
+    gui = opts.gui
 
     time_estimate = time_calc(distance=distance, elevation=elevation,
-        rate=travel_mode, units=units)
+        fitness=fitness, rate=travel_mode, units=units)
 
-    if opts.pretty:
-        print_pretty_estimate(time_estimate)
+    if gui:
+        from . import gui
+        gui.startup()
     else:
-        print_ugly_estimate(time_estimate)
+        if pretty:
+            print_pretty_estimate(time_estimate)
+        else:
+            print_ugly_estimate(time_estimate)
 
     return 0