Add menu keybindings to config

[lightcards.git] / lightcards / runner.py

diff --git a/lightcards/runner.py b/lightcards/runner.py
index 6cb87d40d3f36c4db647e955cd3a70455b208044..73e275875138b93ec7f9edcd05c767b8312dfe45 100644 (file)
--- a/lightcards/runner.py
+++ b/lightcards/runner.py
@@ -3,12 +3,11 @@
 
 import argparse
 import curses
-import os
 import pkg_resources
 from random import shuffle
 import sys
 
-from . import parse, progress
+from . import parse, progress, config
 from .display import Display, CursesError
 from .deck import Status
 
@@ -30,7 +29,6 @@ def parse_args():
         metavar="view",
         type=int,
         choices=range(1, 4),
-        default=1,
         help="specify which view to start in (default = 1)",
     )
     parser.add_argument("inp", metavar="input file", type=str, nargs=1)
@@ -61,7 +59,7 @@ def parse_args():
     return parser.parse_args()
 
 
-def show(args, stack, headers, input_file):
+def show(args, stack, headers, conf):
     """
     Get objects from cache, manipulate deck according to passed arguments, and
     send it to the display functions
@@ -77,15 +75,21 @@ def show(args, stack, headers, input_file):
         (stack) = cache
 
     # Manipulate deck
-    if args.shuffle:
+    if args.shuffle or conf["shuffle"]:
         shuffle(stack)
-    if args.alphabetize:
+    if args.alphabetize or conf["alphabetize"]:
         stack.sort(key=lambda x: x.front)
-    if args.reverse:
+    if args.reverse or conf["reverse"]:
         stack.reverse()
 
+    # Set view
+    if args.view:
+        view = args.view
+    else:
+        view = conf["default_view"]
+
     # Send to display
-    win = Display(stack, headers, idx, args.view, input_file)
+    win = Display(stack, headers, idx, view, args, conf)
     try:
         curses.wrapper(win.run)
     except curses.error as e:
@@ -98,11 +102,16 @@ def get_orig():
 
 
 def main(args=sys.argv):
-    sys.tracebacklimit = 0
     args = parse_args()
+    conf = config.read_file(args.config)
+
     global headers, stack
     (headers, stack) = parse.parse_html(parse.md2html(args.inp[0]))
-    show(args, stack, headers, args)
+
+    if not conf["debug"]:
+        sys.tracebacklimit = 0
+
+    show(args, stack, headers, conf)
 
 
 if __name__ == "__main__":