Clean up lightcards.py

[lightcards.git] / lightcards / lightcards.py

diff --git a/lightcards/lightcards.py b/lightcards/lightcards.py
old mode 100755 (executable)
new mode 100644 (file)
index 45a1e84..a3aa5cf
--- a/lightcards/lightcards.py
+++ b/lightcards/lightcards.py
@@ -1,13 +1,14 @@
-#!/usr/bin/env python
 # Markdown flashcard utility
 # Armaan Bhojwani 2021
 
 import argparse
 from curses import wrapper
+import os
 from random import shuffle
 import sys
 
-from . import display, parse
+from . import parse
+from .display import Display
 from .deck import Status
 
 
@@ -28,11 +29,15 @@ def parse_args():
                         help="shuffle card order")
     parser.add_argument("-v", "--version",
                         action='version',
-                        version="lightcards 0.2.0")
+                        version="lightcards 0.4.0")
     return parser.parse_args()
 
 
 def show(args, stack, headers):
+    """
+    Manipulate deck according to passed arguments, and send it to the display
+    functions
+    """
     idx = Status()
     if args.flip:
         for x in stack:
@@ -42,13 +47,25 @@ def show(args, stack, headers):
         shuffle(stack)
     elif args.reverse:
         stack.reverse()
-    wrapper(display.get_key, stack, headers, idx)
 
+    win = Display(stack, headers, idx)
+    wrapper(win.run)
+
+
+def reparse():
+    """Parse arguments and input file again"""
+    args = parse_args()
+    os.system(f"$EDITOR {args.inp[0]}"),
+    return parse.parse_html(parse.md2html(args.inp[0]))
+
+def get_orig():
+    """Return original header and stack"""
+    return((headers, stack))
 
 def main(args=sys.argv):
     args = parse_args()
-    headers = parse.parse_html(parse.md2html(args.inp[0]))[0]
-    stack = parse.parse_html(parse.md2html(args.inp[0]))[1]
+    global headers, stack
+    (headers, stack) = parse.parse_html(parse.md2html(args.inp[0]))
     show(args, stack, headers)