Remove CursesError exception

[lightcards.git] / lightcards / runner.py

diff --git a/lightcards/runner.py b/lightcards/runner.py
index 3b8737cab801bfe3ec5c46e53a06cd98a9f123ca..40b5b15f25673e0f2c4599ebb950249a35f98977 100644 (file)
--- a/lightcards/runner.py
+++ b/lightcards/runner.py
@@ -8,7 +8,7 @@ from random import shuffle
 import sys
 
 from . import parse, progress, config
-from .display import Display, CursesError
+from .display import Display
 from .deck import Status
 
 
@@ -20,18 +20,33 @@ def parse_args():
     parser.add_argument(
         "-c",
         "--config",
+        metavar="config_file",
         type=str,
+        default="/dev/null",
         help="specify custom config file",
     )
     parser.add_argument(
         "-V",
         "--view",
-        metavar="view",
+        metavar="1-3",
         type=int,
         choices=range(1, 4),
-        help="specify which view to start in (default = 1)",
+        help="specify which view to start in",
+    )
+    parser.add_argument("inp", metavar="input_files", type=str, nargs="+")
+    parser.add_argument(
+        "-l",
+        "--lenient",
+        action="store_true",
+        help="don't raise exception if tables are malformed",
+    )
+    parser.add_argument(
+        "-t",
+        "--table",
+        metavar="num_table",
+        type=int,
+        help="specify which table to use if multiple are given",
     )
-    parser.add_argument("inp", metavar="input file", type=str, nargs=1)
     parser.add_argument(
         "-a",
         "--alphabetize",
@@ -42,7 +57,7 @@ def parse_args():
         "-p",
         "--purge",
         action="store_true",
-        help="don't check cached info before starting",
+        help="delete cache before starting",
     )
     parser.add_argument(
         "-r", "--reverse", action="store_true", help="reverse card order"
@@ -93,7 +108,7 @@ def show(args, stack, headers, conf):
     try:
         curses.wrapper(win.run)
     except curses.error as e:
-        raise CursesError() from e
+        raise e
 
 
 def get_orig():
@@ -105,12 +120,12 @@ def main(args=sys.argv):
     args = parse_args()
     conf = config.read_file(args.config)
 
-    global headers, stack
-    (headers, stack) = parse.parse_html(parse.md2html(args.inp[0]))
-
     if not conf["debug"]:
         sys.tracebacklimit = 0
 
+    global headers, stack
+    (headers, stack) = parse.parse_html(parse.md2html(args.inp), args, conf)
+
     show(args, stack, headers, conf)