Bump version number

[lightcards.git] / lightcards / display.py

diff --git a/lightcards/display.py b/lightcards/display.py
index 09f1e52cdda7cab58d70c6c7f076c3e84ec41d3d..5f7276bac43fe977c0f66fef24213c2bc2062c0a 100644 (file)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -16,6 +16,7 @@ class Display():
         self.obj = obj
 
     def run(self, stdscr):
+        """Set important options before beginning"""
         self.win = stdscr
         curses.curs_set(0)  # Hide cursor
         curses.init_pair(1, curses.COLOR_CYAN, 0)
@@ -24,12 +25,17 @@ class Display():
         self.get_key()
 
     def leave(self):
+        """Pickle stack before quitting"""
         if self.obj.getIdx() == len(self.stack):
             self.obj.setIdx(0)
 
-        progress.dump((self.obj, self.stack, self.headers), self.stack)
+        progress.dump(self.stack, lightcards.get_orig())
         sys.exit(0)
 
+    def ntotal(self):
+        """Get toal number of starred cards"""
+        return(len([card for card in self.stack if card.getStar()]))
+
     def disp_bar(self):
         """
         Display the statusbar at the bottom of the screen with progress, star
@@ -53,11 +59,12 @@ class Display():
         # Create bar component
         bar_start = "["
         bar_middle = self.stack[self.obj.getIdx()].printStar()
-        bar_end = "] [" + percent + "% (" + \
+        bar_end = f"] [{self.ntotal()}/{str(len(self.stack))} starred] " + \
+            f"[{percent}% (" + \
             str(self.obj.getIdx() + 1).zfill(len(str(len(self.stack)))) + \
-            "/" + str(len(self.stack)) + ")] [" + \
-            self.headers[self.obj.getSide()] + " (" + \
-            str(self.obj.getSide() + 1) + ")]"
+            f"/{str(len(self.stack))})] [" + \
+            f"{self.headers[self.obj.getSide()]} (" + \
+            f"{str(self.obj.getSide() + 1)})] "
 
         # Put it all togethor
         self.win.hline(mlines - 2, 0, 0, mcols)
@@ -66,6 +73,7 @@ class Display():
         self.win.insstr(bar_end, curses.color_pair(1))
 
     def menu_print(self, string, err=False):
+        """Print messages on the menu screen"""
         self.win.clear()
         if err:
             color = curses.color_pair(2)
@@ -76,6 +84,7 @@ class Display():
         self.menu_grab()
 
     def menu_grab(self):
+        """Grab keypresses for the menu screen"""
         while True:
             key = self.win.getkey()
             if key == "q":
@@ -87,6 +96,9 @@ class Display():
             elif key == "y":
                 self.stack = lightcards.get_orig()[1]
                 self.menu_print("Stack reset!")
+            elif key == "a":
+                self.stack.sort()
+                self.menu_print("Stack alphabetized!")
             elif key == "u":
                 [x.unStar() for x in self.stack]
                 self.menu_print("All unstarred!")
@@ -141,6 +153,7 @@ class Display():
                         curses.A_BOLD)
         self.win.hline(1, 0, curses.ACS_HLINE, 15)
         self.win.addstr(2, 0, "[y]: reset stack to original state\n" +
+                        "[a]: alphabetize stack\n" +
                         "[z]: shuffle stack\n" +
                         "[f]: flip all cards in stack\n" +
                         "[t]: reverse stack order\n" +
@@ -154,6 +167,7 @@ class Display():
             self.menu_grab()
 
     def wrap_width(self):
+        """Calculate the width at which the body should wrap"""
         (_, mcols) = self.win.getmaxyx()
         wrap_width = mcols - 20
         if wrap_width > 80:
@@ -271,29 +285,27 @@ class Display():
                 self.get_key()
 
     def disp_sidebar(self):
+        """Display a sidebar with the starred terms"""
         (mlines, mcols) = self.win.getmaxyx()
+        left = mcols - 19
+
         self.win.addstr(0, mcols - 16, "STARRED CARDS",
                         curses.color_pair(3) + curses.A_BOLD)
-        self.win.vline(0, mcols - 20, 0, mlines)
-        self.win.hline(1, mcols - 19, 0, mlines)
-
-        total = [card for card in self.stack if card.getStar()]
-        ntotal = len(total)
+        self.win.vline(0, mcols - 20, 0, mlines - 2)
+        self.win.hline(1, left, 0, mlines)
 
         i = 0
         for card in self.stack:
             if i > mlines - 6:
-                self.win.addstr(2 + i, mcols - 19, f"... ({ntotal - i} more)")
+                self.win.addstr(2 + i, left, f"... ({self.ntotal() - i} more)")
                 break
             elif card.getStar():
                 term = card[0]
                 if len(card[0]) > 18:
                     term = card[0][:18] + "…"
-                self.win.addstr(2 + i, mcols - 19, term)
+                self.win.addstr(2 + i, left, term)
 
                 i += 1
 
         if i == 0:
-            self.win.addstr(2, mcols - 19, "None starred")
-
-        self.win.addstr(mlines - 1, mcols - 19, f"{ntotal}/{str(len(self.stack))}")
+            self.win.addstr(2, left, "None starred")