X-Git-Url: https://git.armaanb.net/?p=lightcards.git;a=blobdiff_plain;f=lightcards%2Flightcards.py;h=da9d90310ce8079b9e19348569e93b92b822cd19;hp=41b0db738a5d5520fdd2ee6e0e3b15ec2fd8a025;hb=687fb8dc4e088723e7935d3030e5d38b9b294776;hpb=58314c0a25a5ecd1ca044359821b58d837bb5281

diff --git a/lightcards/lightcards.py b/lightcards/lightcards.py
index 41b0db7..da9d903 100755
--- a/lightcards/lightcards.py
+++ b/lightcards/lightcards.py
@@ -8,7 +8,8 @@ import os
 from random import shuffle
 import sys
 
-from . import display, parse
+from . import parse
+from .display import Display
 from .deck import Status
 
 
@@ -29,7 +30,7 @@ def parse_args():
                         help="shuffle card order")
     parser.add_argument("-v", "--version",
                         action='version',
-                        version="lightcards 0.3.0")
+                        version="lightcards 0.4.0")
     return parser.parse_args()
 
 
@@ -47,7 +48,9 @@ def show(args, stack, headers):
         shuffle(stack)
     elif args.reverse:
         stack.reverse()
-    wrapper(display.init_disp, stack, headers, idx)
+
+    win = Display(stack, headers, idx)
+    wrapper(win.run)
 
 
 def reparse():
@@ -55,10 +58,14 @@ def reparse():
     os.system(f"$EDITOR {args.inp[0]}"),
     return parse.parse_html(parse.md2html(args.inp[0]))
 
+def get_orig():
+    return((headers2, stack2))
 
 def main(args=sys.argv):
     args = parse_args()
     (headers, stack) = parse.parse_html(parse.md2html(args.inp[0]))
+    global headers2, stack2
+    (headers2, stack2) = (headers, stack)
     show(args, stack, headers)