Normalized --avoid for places

eyeonus · May 4, 2015 · 95b3dbd · 95b3dbd
1 parent 846b68f
commit 95b3dbd
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/commands/buy_cmd.py b/commands/buy_cmd.py
@@ -51,14 +51,7 @@
         default=None,
         type=int,
     ),
-    ParseArgument(
-        '--avoid',
-        help=(
-            "Don't list results for specified systems/stations.\n"
-            "Names can be one-per --avoid or comma separated."
-        ),
-        action='append',
-    ),
+    AvoidPlacesArgument(),
     PadSizeArgument(),
     BlackMarketSwitch(),
     MutuallyExclusiveGroup(

diff --git a/commands/nav_cmd.py b/commands/nav_cmd.py
@@ -22,12 +22,7 @@
         metavar='N.NN',
         type=float,
     ),
-    ParseArgument('--avoid',
-        help='Exclude a system from the route. If you specify a station, '
-             'the system that station is in will be avoided instead.',
-        action='append',
-        default=[],
-    ),
+    AvoidPlacesArgument(),
     ParseArgument('--via',
         help='Require specified systems/stations to be en-route (in order).',
         action='append',
@@ -232,4 +227,4 @@ def render(results, cmdenv, tdb):
         for stnRow in row.stations:
             print(stnRowFmt.format(stnRow))
 
-    return results
+    return results
diff --git a/commands/parsing.py b/commands/parsing.py
@@ -61,6 +61,19 @@ def __init__(self):
         }
 
 
+class AvoidPlacesArgument(ParseArgument):
+    def __init__(self):
+        self.args = ['--avoid']
+        self.kwargs = {
+            'action': 'append',
+            'help': (
+                "Don't list results for the specified systems or stations.\n"
+                "Names can be one-per '--avoid' or comma separated, e.g. "
+                "'--avoid a,b,c' or '--avoid a,b --avoid c'"
+            ),
+        }
+
+
 class SwitchArgument(ParseArgument):
     def __init__(self, help=None):
         if isinstance(self.switches, (tuple, list)):

diff --git a/commands/sell_cmd.py b/commands/sell_cmd.py
@@ -27,14 +27,7 @@
             metavar='N.NN',
             type=float,
     ),
-    ParseArgument(
-        '--avoid',
-        help=(
-            "Don't list results for specified systems/stations.\n"
-            "Names can be one-per --avoid or comma separated."
-        ),
-        action='append',
-    ),
+    AvoidPlacesArgument(),
     PadSizeArgument(),
     BlackMarketSwitch(),
     ParseArgument('--limit',