Add option to start in a specific view

[lightcards.git] / lightcards / runner.py

diff --git a/lightcards/runner.py b/lightcards/runner.py
index 2fa42f49e6cc214c92b82d2d1ea8a76fc825acb9..08004db3bd68d4e261fb080c7c777c7ae94b0fd3 100644 (file)
--- a/lightcards/runner.py
+++ b/lightcards/runner.py
@@ -4,6 +4,7 @@
 import argparse
 from curses import wrapper
 import os
+import pkg_resources
 from random import shuffle
 import sys
 
@@ -13,9 +14,19 @@ from .deck import Status
 
 
 def parse_args():
+    """Parse command line arguments"""
     parser = argparse.ArgumentParser(
         description="Terminal flashcards from Markdown"
     )
+    parser.add_argument(
+        "-V",
+        "--view",
+        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)
     parser.add_argument(
         "-a",
@@ -23,9 +34,6 @@ def parse_args():
         action="store_true",
         help="alphabetize card order",
     )
-    parser.add_argument(
-        "-f", "--flip", action="store_true", help="show second column first"
-    )
     parser.add_argument(
         "-p",
         "--purge",
@@ -39,7 +47,10 @@ def parse_args():
         "-s", "--shuffle", action="store_true", help="shuffle card order"
     )
     parser.add_argument(
-        "-v", "--version", action="version", version="lightcards 0.6.0"
+        "-v",
+        "--version",
+        action="version",
+        version=f"lightcards {pkg_resources.require('lightcards')[0].version}",
     )
     return parser.parse_args()
 
@@ -55,7 +66,7 @@ def show(args, stack, headers):
 
     # Check for caches
     idx = Status()
-    cache = progress.dive(get_orig())
+    cache = progress.dive(get_orig()[1])
     if cache:
         (stack) = cache
 
@@ -63,16 +74,12 @@ def show(args, stack, headers):
     if args.shuffle:
         shuffle(stack)
     if args.alphabetize:
-        stack.sort()
+        stack.sort(key=lambda x: x.front)
     if args.reverse:
         stack.reverse()
-    if args.flip:
-        for x in stack:
-            x[0], x[1] = x[1], x[0]
-        headers[0], headers[1] = headers[1], headers[0]
 
     # Send to display
-    win = Display(stack, headers, idx)
+    win = Display(stack, headers, idx, args.view)
     wrapper(win.run)