Allow for config files to be incomplete

[lightcards.git] / lightcards / runner.py

diff --git a/lightcards/runner.py b/lightcards/runner.py
index 6cb87d40d3f36c4db647e955cd3a70455b208044..15a622983235a671fd6b330b7efe75a6bd42dc55 100644 (file)
--- a/lightcards/runner.py
+++ b/lightcards/runner.py
@@ -3,12 +3,11 @@
 
 import argparse
 import curses
 
 import argparse
 import curses

-import os

 import pkg_resources
 from random import shuffle
 import sys
 
 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
 
 from .display import Display, CursesError
 from .deck import Status
 


@@ -61,7 +60,7 @@ def parse_args():
     return parser.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
     """
     Get objects from cache, manipulate deck according to passed arguments, and
     send it to the display functions


@@ -85,7 +84,7 @@ def show(args, stack, headers, input_file):
         stack.reverse()
 
     # Send to display
         stack.reverse()
 
     # Send to display

-    win = Display(stack, headers, idx, args.view, input_file)
+    win = Display(stack, headers, idx, args.view, args, conf)

     try:
         curses.wrapper(win.run)
     except curses.error as e:
     try:
         curses.wrapper(win.run)
     except curses.error as e:


@@ -98,11 +97,15 @@ def get_orig():
 
 
 def main(args=sys.argv):
 
 
 def main(args=sys.argv):

-    sys.tracebacklimit = 0

     args = parse_args()
     global headers, stack
     (headers, stack) = parse.parse_html(parse.md2html(args.inp[0]))
     args = parse_args()
     global headers, stack
     (headers, stack) = parse.parse_html(parse.md2html(args.inp[0]))

-    show(args, stack, headers, args)
+    conf = config.read_file(args.config)
+
+    if not conf["debug"]:
+        sys.tracebacklimit = 0
+
+    show(args, stack, headers, conf)

 
 
 if __name__ == "__main__":
 
 
 if __name__ == "__main__":