Redo menu at end of stack

[lightcards.git] / lightcards / display.py

diff --git a/lightcards/display.py b/lightcards/display.py
index a707fc15950244939afda2c206f6fe38c9afddb5..d6d8de22b02d7722d52b785cf973888a91b24923 100755 (executable)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -6,6 +6,8 @@ from random import shuffle
 import sys
 import textwrap
 
+from . import lightcards
+
 
 def disp_bar(stdscr, stack, headers, obj):
     """
@@ -20,11 +22,15 @@ def disp_bar(stdscr, stack, headers, obj):
     else:
         percent = str(round(obj.getIdx() / (len(stack) - 1) * 100)).zfill(3)
 
+    # Print yellow if starred
+    stdscr.addstr(mlines - 1, 0, "[", curses.color_pair(1))
+    if stack[obj.getIdx()].getStar():
+        stdscr.addstr(stack[obj.getIdx()].printStar(), curses.color_pair(3))
+    else:
+        stdscr.addstr(stack[obj.getIdx()].printStar(), curses.color_pair(1))
+
     # Put all the info together
-    stdscr.insstr(mlines - 1, 0,
-                  "[" +
-                  stack[obj.getIdx()].printStar() +
-                  "] [" +
+    stdscr.addstr("] [" +
                   percent +
                   "% (" +
                   str(obj.getIdx() + 1).zfill(len(str(len(stack)))) +
@@ -43,26 +49,50 @@ def disp_menu(stdscr, stack, headers, idx):
     Display a menu once the end of the deck has been reached, offering
     multiple options on how to continue.
     """
-    stdscr.addstr("Good job, you've completed a round!\n\n",
-                  curses.color_pair(1))
-    stdscr.addstr("Choose one of the following options:\n" +
+    def menu_print(stdscr, stack, headers, idx, string, err=False):
+        stdscr.clear()
+        if err:
+            stdscr.addstr(string + "\n\n", curses.color_pair(2))
+        else:
+            stdscr.addstr(string + "\n\n", curses.color_pair(1))
+        disp_menu(stdscr, stack, headers, idx)
+
+    stdscr.addstr("Choose one of the following options:\n\n" +
+                  "[y]: reset stack to original state\n" +
+                  "[z]: shuffle stack\n" +
+                  "[f]: flip all cards in stack\n" +
+                  "[t]: reverse stack order\n" +
+                  "[u]: unstar all\n" +
+                  "[s]: update stack to include starred only\n\n" +
                   "[r]: restart\n" +
-                  "[s]: restart with starred only\n" +
-                  "[u]: restart and unstar all\n" +
-                  "[z]: restart and shuffle cards\n" +
                   "[q]: quit")
+    idx.setIdx(0)
     while True:
         key = stdscr.getkey()
         if key == "q":
             sys.exit(0)
-        elif key == "r":
-            idx.setIdx(0)
-            get_key(stdscr, stack, headers, idx)
+        elif key == "y":
+            stack = lightcards.get_orig()[1]
+            menu_print(stdscr, stack, headers, idx,
+                       "Stack reset!")
         elif key == "u":
-            idx.setIdx(0)
+            [x.unStar() for x in stack]
+            menu_print(stdscr, stack, headers, idx,
+                       "All unstarred!")
+        elif key == "t":
+            stack.reverse()
+            menu_print(stdscr, stack, headers, idx,
+                       "Stack reversed!")
+        elif key == "z":
+            shuffle(stack)
+            menu_print(stdscr, stack, headers, idx,
+                       "Stack shuffled!")
+        elif key == "f":
             for x in stack:
-                x.unStar()
-            get_key(stdscr, stack, headers, idx)
+                x[0], x[1] = x[1], x[0]
+            headers[0], headers[1] = headers[1], headers[0]
+            menu_print(stdscr, stack, headers, idx,
+                       "Cards flipped!")
         elif key == "s":
             # Check if there are any starred cards before proceeding, and if
             # not, don't allow to proceed and show an error message
@@ -70,19 +100,17 @@ def disp_menu(stdscr, stack, headers, idx):
             for x in stack:
                 if x.getStar():
                     cont = True
+                    break
 
             if cont:
-                idx.setIdx(0)
                 stack = [x for x in stack if x.getStar()]
-                get_key(stdscr, stack, headers, idx)
+                menu_print(stdscr, stack, headers, idx,
+                           "Stars only!")
             else:
-                stdscr.clear()
-                stdscr.addstr("ERR: Stack empty. Choose another option\n\n",
-                              curses.color_pair(2))
-                disp_menu(stdscr, stack, headers, idx)
-        elif key == "z":
-            idx.setIdx(0)
-            shuffle(stack)
+                menu_print(stdscr, stack, headers, idx,
+                           "ERR: None are starred!",
+                           err=True)
+        elif key == "r":
             get_key(stdscr, stack, headers, idx)
 
 
@@ -140,7 +168,8 @@ def disp_help(stdscr, stack, headers, idx):
                   "i, /               star card\n" +
                   "0, ^, home         go to the start of the deck\n" +
                   "$, end             go to the end of the deck\n" +
-                  "H, ?               open this screen\n\n" +
+                  "H, ?               open this screen\n" +
+                  "e                  open the input file in $EDITOR\n\n" +
                   "More information can be found in the man page, or by\n" +
                   "running `lightcards --help`.\n\n" +
                   "Press [q], [H], or [?] to go back.")
@@ -155,6 +184,7 @@ def init_disp(stdscr, stack, headers, idx):
     curses.curs_set(0)  # Hide cursor
     curses.init_pair(1, curses.COLOR_CYAN, 0)
     curses.init_pair(2, curses.COLOR_RED, 0)
+    curses.init_pair(3, curses.COLOR_YELLOW, 0)
     get_key(stdscr, stack, headers, idx)
 
 
@@ -193,3 +223,6 @@ def get_key(stdscr, stack, headers, idx):
             disp_card(stdscr, stack, headers, idx)
         elif key in ["H", "?"]:
             disp_help(stdscr, stack, headers, idx)
+        elif key == "e":
+            (headers, stack) = lightcards.reparse()
+            get_key(stdscr, stack, headers, idx)