Fix pickle implementation

[lightcards.git] / lightcards / display.py

diff --git a/lightcards/display.py b/lightcards/display.py
index 35cd149482a64e4c0bd2f7c8f8b6384faa22a925..a130728e703776f8ee1d5b62ccad9454886da353 100644 (file)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -7,7 +7,7 @@ from random import shuffle
 import sys
 import textwrap
 
-from . import lightcards, progress
+from . import runner, progress
 
 
 class Display:
@@ -17,7 +17,7 @@ class Display:
         self.obj = obj
 
     def run(self, stdscr):
-        """Set important options before beginning"""
+        """Set important options that require stdscr before starting"""
         self.win = stdscr
         (mlines, mcols) = self.win.getmaxyx()
         curses.curs_set(0)  # Hide cursor
@@ -32,13 +32,14 @@ class Display:
         self.get_key()
 
     def panel_create(self, x, y):
-        """Create popup menus"""
+        """Create popup panels to a certain scale"""
         win = curses.newwin(x, y)
         panel = curses.panel.new_panel(win)
         win.erase()
         return (win, panel)
 
     def panel_up(self):
+        """Update panel and window contents"""
         curses.panel.update_panels()
         self.win.refresh()
 
@@ -47,11 +48,11 @@ class Display:
         if self.obj.getIdx() + 1 == len(self.stack):
             self.obj.setIdx(0)
 
-        progress.dump(self.stack, lightcards.get_orig())
+        progress.dump(self.stack, runner.get_orig()[1])
         sys.exit(0)
 
     def ntotal(self):
-        """Get toal number of starred cards"""
+        """Get total number of starred cards"""
         return [card for card in self.stack if card.getStar()]
 
     def disp_bar(self):
@@ -84,7 +85,7 @@ class Display:
             + str(self.obj.getIdx() + 1).zfill(len(str(len(self.stack))))
             + f"/{str(len(self.stack))})] ["
             + f"{self.headers[self.current_card().getSide()]} ("
-            + f"{str(self.current_card().getSide()) + str(1)})] "
+            + f"{str(int(self.current_card().getSide()) + 1)})] "
         )
 
         # Put it all togethor
@@ -112,7 +113,7 @@ class Display:
         self.menu_grab()
 
     def menu_grab(self):
-        """Grab keypresses for the menu screen"""
+        """Grab keypresses on the menu screen"""
         while True:
             key = self.win.getkey()
             if key in ["r", "q", "m"]:
@@ -125,7 +126,7 @@ class Display:
                     self.obj.setIdx(0)
                 self.get_key()
             elif key == "y":
-                self.stack = lightcards.get_orig()[1]
+                self.stack = runner.get_orig()[1]
                 self.menu_print("Stack reset!")
             elif key == "a":
                 self.stack.sort()
@@ -172,6 +173,7 @@ class Display:
                 self.get_key()
 
     def menu_init(self, quit=True):
+        """Initialize the menu with content"""
         (self.menu_win, self.menu_panel) = self.panel_create(17, 44)
         self.menu_panel.top()
         self.menu_panel.hide()
@@ -205,8 +207,8 @@ class Display:
 
     def disp_menu(self, keygrab=True):
         """
-        Display a menu once the end of the deck has been reached, offering
-        multiple options on how to continue.
+        Display a menu offering multiple options on how to manipulate the deck
+        and to continue
         """
         (mlines, mcols) = self.win.getmaxyx()
         self.menu_win.mvwin(int(mlines / 2) - 9, int(mcols / 2) - 22)
@@ -217,7 +219,7 @@ class Display:
             self.menu_grab()
 
     def wrap_width(self):
-        """Calculate the width at which the body should wrap"""
+        """Calculate the width at which the body text should wrap"""
         (_, mcols) = self.win.getmaxyx()
         wrap_width = mcols - 20
         if wrap_width > 80:
@@ -226,7 +228,7 @@ class Display:
 
     def disp_card(self):
         """
-        Display the contents of the card
+        Display the contents of the card.
         Shows a header, a horizontal line, and the contents of the current
         side.
         """
@@ -281,7 +283,7 @@ class Display:
         self.win.hline(mlines - 2, 0, 0, mcols)
 
     def help_init(self):
-        """Display help screen"""
+        """Initialize help screen"""
         (self.help_win, self.help_panel) = self.panel_create(20, 52)
         self.help_panel.top()
         self.help_panel.hide()
@@ -291,7 +293,7 @@ class Display:
         )
         self.help_win.hline(2, 1, curses.ACS_HLINE, 15)
         text = [
-            "Welcome to lightcards. Here are some keybindings",
+            "Welcome to runner. Here are some keybindings",
             "to get you started:",
             "",
             "h, left          previous card",
@@ -316,6 +318,7 @@ class Display:
         self.help_win.box()
 
     def disp_help(self):
+        """Display help screen"""
         (mlines, mcols) = self.win.getmaxyx()
         self.help_win.mvwin(int(mlines / 2) - 10, int(mcols / 2) - 26)
         self.panel_up()
@@ -327,6 +330,7 @@ class Display:
                 self.get_key()
 
     def current_card(self):
+        """Get current card object"""
         return self.stack[self.obj.getIdx()]
 
     def get_key(self):
@@ -334,7 +338,6 @@ class Display:
         Display a card and wait for the input.
         Used as a general way of getting back into the card flow from a menu
         """
-
         self.disp_card()
         while True:
             key = self.win.getkey()
@@ -370,7 +373,7 @@ class Display:
             elif key == "m":
                 self.disp_menu()
             elif key == "e":
-                (self.headers, self.stack) = lightcards.reparse()
+                (self.headers, self.stack) = runner.reparse()
                 self.get_key()
 
     def disp_sidebar(self):