Add shuffle functionality

[lightcards.git] / lightcards / display.py

diff --git a/lightcards/display.py b/lightcards/display.py
index 0e58870fb7c907e9a34d1fa033723fe6d25c9f8f..7a6ec1b22ffbb0bd667e05fde4ef638b88daa018 100755 (executable)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -2,6 +2,7 @@
 # Armaan Bhojwani 2021
 
 import curses
+from random import shuffle
 
 
 def disp_bar(stdscr, stack, headers, obj):
@@ -29,7 +30,11 @@ def disp_bar(stdscr, stack, headers, obj):
 def disp_menu(stdscr, stack, headers, idx):
     stdscr.addstr("Good job, you've completed a round!\n\n" +
                   "Choose one of the following options:\n" +
-                  "[r]estart, [s]tarred only, [u]nstar all and restart, [q]uit")
+                  "[r]: restart\n" +
+                  "[s]: restart with starred only\n" +
+                  "[u]: restart and unstar all\n" +
+                  "[z]: restart and shuffle cards\n" +
+                  "[q]: quit")
     while True:
         key = stdscr.getkey()
         if key == "q":
@@ -56,6 +61,10 @@ def disp_menu(stdscr, stack, headers, idx):
                 stdscr.clear()
                 stdscr.addstr("ERR: Stack empty. Choose another option\n\n")
                 disp_menu(stdscr, stack, headers, idx)
+        elif key == "z":
+            idx.setIdx(0)
+            shuffle(stack)
+            get_key(stdscr, stack, headers, idx)
 
 
 def disp_card(stdscr, stack, headers, obj):
@@ -63,9 +72,14 @@ def disp_card(stdscr, stack, headers, obj):
     if obj.getIdx() == len(stack):
         disp_menu(stdscr, stack, headers, obj)
     else:
-        side_title = headers[obj.getSide()]
-        stdscr.addstr(side_title + "\n")
-        for i in range(len(side_title)):
+        if obj.getSide() == 0:
+            top = headers[obj.getSide()] + " " + str(obj.getIdx() + 1) + "\n"
+        else:
+            top = headers[obj.getSide()] + " " + str(obj.getIdx() + 1) + \
+                "; " + str(stack[obj.getIdx()][0]) + "\n"
+
+        stdscr.addstr(top)
+        for i in range(len(top)):
             stdscr.addch("=")
         stdscr.addstr("\n" + str(stack[obj.getIdx()][obj.getSide()]))
     disp_bar(stdscr, stack, headers, obj)
@@ -93,3 +107,9 @@ def get_key(stdscr, stack, headers, idx):
         elif key in ["i", "/"]:
             stack[idx.getIdx()].toggleStar()
             disp_card(stdscr, stack, headers, idx)
+        elif key in ["0", "^", "KEY_HOME"]:
+            idx.setIdx(0)
+            disp_card(stdscr, stack, headers, idx)
+        elif key in ["$", "KEY_END"]:
+            idx.setIdx(len(stack) - 1)
+            disp_card(stdscr, stack, headers, idx)