]> git.armaanb.net Git - lightcards.git/blobdiff - lightcards/display.py
Make parser reject single column tables
[lightcards.git] / lightcards / display.py
index 2aa891e0e232affb704901ce10dbf2966788ad00..35cd149482a64e4c0bd2f7c8f8b6384faa22a925 100644 (file)
@@ -10,7 +10,7 @@ import textwrap
 from . import lightcards, progress
 
 
-class Display():
+class Display:
     def __init__(self, stack, headers, obj):
         self.stack = stack
         self.headers = headers
@@ -44,7 +44,7 @@ class Display():
 
     def leave(self):
         """Pickle stack before quitting"""
-        if self.obj.getIdx() == len(self.stack):
+        if self.obj.getIdx() + 1 == len(self.stack):
             self.obj.setIdx(0)
 
         progress.dump(self.stack, lightcards.get_orig())
@@ -52,7 +52,7 @@ class Display():
 
     def ntotal(self):
         """Get toal number of starred cards"""
-        return([card for card in self.stack if card.getStar()])
+        return [card for card in self.stack if card.getStar()]
 
     def disp_bar(self):
         """
@@ -65,30 +65,37 @@ class Display():
         if len(self.stack) <= 1:
             percent = "100"
         else:
-            percent = str(round(self.obj.getIdx() /
-                                len(self.stack) * 100)).zfill(2)
+            percent = str(
+                round(self.obj.getIdx() / len(self.stack) * 100)
+            ).zfill(2)
 
         # Print yellow if starred
-        if self.stack[self.obj.getIdx()].getStar():
+        if self.current_card().getStar():
             star_color = curses.color_pair(3)
         else:
             star_color = curses.color_pair(1)
 
         # Create bar component
         bar_start = "["
-        bar_middle = self.stack[self.obj.getIdx()].printStar()
-        bar_end = f"] [{len(self.ntotal())}/{str(len(self.stack))} starred] " + \
-            f"[{percent}% (" + \
-            str(self.obj.getIdx() + 1).zfill(len(str(len(self.stack)))) + \
-            f"/{str(len(self.stack))})] [" + \
-            f"{self.headers[self.obj.getSide()]} (" + \
-            f"{str(self.obj.getSide() + 1)})] "
+        bar_middle = self.current_card().printStar()
+        bar_end = (
+            f"] [{len(self.ntotal())}/{str(len(self.stack))} starred] "
+            + f"[{percent}% ("
+            + 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)})] "
+        )
 
         # Put it all togethor
         self.win.addstr(mlines - 1, 0, bar_start, curses.color_pair(1))
         self.win.addstr(mlines - 1, len(bar_start), bar_middle, star_color)
-        self.win.addstr(mlines - 1, len(bar_start + bar_middle),
-                        bar_end, curses.color_pair(1))
+        self.win.addstr(
+            mlines - 1,
+            len(bar_start + bar_middle),
+            bar_end,
+            curses.color_pair(1),
+        )
 
     def menu_print(self, string, err=False):
         """Print messages on the menu screen"""
@@ -98,7 +105,7 @@ class Display():
             color = curses.color_pair(1)
 
         for i in range(42):
-            self.menu_win.addch(15, i+1, " ")
+            self.menu_win.addch(15, i + 1, " ")
 
         self.menu_win.addstr(15, 1, string, color)
         self.panel_up()
@@ -112,9 +119,9 @@ class Display():
                 self.menu_panel.hide()
                 self.panel_up()
             if key in ["q", "m"]:
-                if len(self.stack) == self.obj.getIdx():
+                if len(self.stack) == self.obj.getIdx() + 1:
                     self.leave()
-                elif len(self.stack) < self.obj.getIdx():
+                elif len(self.stack) < self.obj.getIdx() + 1:
                     self.obj.setIdx(0)
                 self.get_key()
             elif key == "y":
@@ -131,16 +138,17 @@ class Display():
                 self.menu_print("All starred!")
             elif key == "t":
                 self.stack.reverse()
-                self.menu_print(
-                    "Stack reversed!")
+                self.menu_print("Stack reversed!")
             elif key == "z":
                 shuffle(self.stack)
                 self.menu_print("Stack shuffled!")
             elif key == "f":
                 for x in self.stack:
                     x[0], x[1] = x[1], x[0]
-                (self.headers[0], self.headers[1]) = (self.headers[1],
-                                                      self.headers[0])
+                (self.headers[0], self.headers[1]) = (
+                    self.headers[1],
+                    self.headers[0],
+                )
                 self.menu_print("Cards flipped!")
             elif key == "s":
                 # Check if there are any starred cards before proceeding, and
@@ -172,17 +180,20 @@ class Display():
         if quit:
             quit_text = "[q]: quit"
 
-        self.menu_win.addstr(1, 1, "LIGHTCARDS MENU", curses.color_pair(1) +
-                        curses.A_BOLD)
+        self.menu_win.addstr(
+            1, 1, "LIGHTCARDS MENU", curses.color_pair(1) + curses.A_BOLD
+        )
         self.menu_win.hline(2, 1, curses.ACS_HLINE, 15)
-        text = ["[y]: reset stack to original state",
-                "[a]: alphabetize stack",
-                "[z]: shuffle stack",
-                "[f]: flip all cards in stack",
-                "[t]: reverse stack order",
-                "[u]: unstar all",
-                "[d]: star all",
-                "[s]: update stack to include starred only"]
+        text = [
+            "[y]: reset stack to original state",
+            "[a]: alphabetize stack",
+            "[z]: shuffle stack",
+            "[f]: flip all cards in stack",
+            "[t]: reverse stack order",
+            "[u]: unstar all",
+            "[d]: star all",
+            "[s]: update stack to include starred only",
+        ]
 
         for t in enumerate(text):
             self.menu_win.addstr(t[0] + 3, 1, t[1])
@@ -198,7 +209,7 @@ class Display():
         multiple options on how to continue.
         """
         (mlines, mcols) = self.win.getmaxyx()
-        self.menu_win.mvwin(int(mlines/2) - 9, int(mcols/2) - 22)
+        self.menu_win.mvwin(int(mlines / 2) - 9, int(mcols / 2) - 22)
         self.menu_panel.show()
         self.panel_up()
 
@@ -220,37 +231,50 @@ class Display():
         side.
         """
         (mlines, mcols) = self.win.getmaxyx()
-        if self.obj.getIdx() == len(self.stack):
-            self.disp_menu()
+        self.main_panel.bottom()
+        self.main_win.clear()
+        # If on the back of the card, show the content of the front side in
+        # the header
+        num_done = str(self.obj.getIdx() + 1).zfill(len(str(len(self.stack))))
+        if self.current_card().getSide() == 0:
+            top = (
+                num_done + " | " + self.headers[self.current_card().getSide()]
+            )
         else:
-            self.main_panel.bottom()
-            self.main_win.clear()
-            # If on the back of the card, show the content of the front side in
-            # the header
-            num_done = str(self.obj.getIdx() +
-                           1).zfill(len(str(len(self.stack))))
-            if self.obj.getSide() == 0:
-                top = num_done + " | " + self.headers[self.obj.getSide()]
-            else:
-                top = num_done + " | " + self.headers[self.obj.getSide()] + \
-                    " | \"" + str(self.stack[self.obj.getIdx()][0]) + "\""
-            header_width = mcols
-            if mcols > 80:
-                header_width = 80
-
-            self.main_win.addstr(0, 0, textwrap.shorten(top, width=header_width,
-                                             placeholder="…"), curses.A_BOLD)
-
-            # Add horizontal line
-            lin_width = header_width
-            if len(top) < header_width:
-                lin_width = len(top)
-            self.main_win.hline(1, 0, curses.ACS_HLINE, lin_width)
-
-            # Show current side
-            self.main_win.addstr(2, 0, textwrap.fill(
-                self.stack[self.obj.getIdx()][self.obj.getSide()],
-                width=self.wrap_width()))
+            top = (
+                num_done
+                + " | "
+                + self.headers[self.current_card().getSide()]
+                + ' | "'
+                + str(self.current_card().getFront())
+                + '"'
+            )
+        header_width = mcols
+        if mcols > 80:
+            header_width = 80
+
+        self.main_win.addstr(
+            0,
+            0,
+            textwrap.shorten(top, width=header_width, placeholder="…"),
+            curses.A_BOLD,
+        )
+
+        # Add horizontal line
+        lin_width = header_width
+        if len(top) < header_width:
+            lin_width = len(top)
+        self.main_win.hline(1, 0, curses.ACS_HLINE, lin_width)
+
+        # Show current side
+        self.main_win.addstr(
+            2,
+            0,
+            textwrap.fill(
+                self.current_card().get(),
+                width=self.wrap_width(),
+            ),
+        )
         self.panel_up()
         self.disp_bar()
         self.disp_sidebar()
@@ -262,26 +286,29 @@ class Display():
         self.help_panel.top()
         self.help_panel.hide()
         self.help_win.clear()
-        self.help_win.addstr(1, 1, "LIGHTCARDS HELP", curses.color_pair(1) +
-                             curses.A_BOLD)
+        self.help_win.addstr(
+            1, 1, "LIGHTCARDS HELP", curses.color_pair(1) + curses.A_BOLD
+        )
         self.help_win.hline(2, 1, curses.ACS_HLINE, 15)
-        text = ["Welcome to lightcards. Here are some keybindings",
-                "to get you started:",
-                "",
-                "h, left          previous card",
-                "l, right         next card",
-                "j, k, up, down   flip card",
-                "i, /             star card",
-                "0, ^, home       go to the start of the deck",
-                "$, end           go to the end of the deck",
-                "H, ?             open this screen",
-                "e                open the input file in $EDITOR",
-                "m                open the control menu",
-                "",
-                "More information can be found in the man page, or",
-                "by running `lightcards --help`.",
-                "",
-                "Press [q], [H], or [?] to go back."]
+        text = [
+            "Welcome to lightcards. Here are some keybindings",
+            "to get you started:",
+            "",
+            "h, left          previous card",
+            "l, right         next card",
+            "j, k, up, down   flip card",
+            "i, /             star card",
+            "0, ^, home       go to the start of the deck",
+            "$, end           go to the end of the deck",
+            "H, ?             open this screen",
+            "e                open the input file in $EDITOR",
+            "m                open the control menu",
+            "",
+            "More information can be found in the man page, or",
+            "by running `lightcards --help`.",
+            "",
+            "Press [q], [H], or [?] to go back.",
+        ]
 
         for t in enumerate(text):
             self.help_win.addstr(t[0] + 3, 1, t[1])
@@ -290,7 +317,7 @@ class Display():
 
     def disp_help(self):
         (mlines, mcols) = self.win.getmaxyx()
-        self.help_win.mvwin(int(mlines/2) - 10, int(mcols/2) - 26)
+        self.help_win.mvwin(int(mlines / 2) - 10, int(mcols / 2) - 26)
         self.panel_up()
         self.help_panel.show()
         while True:
@@ -299,6 +326,9 @@ class Display():
                 self.help_panel.hide()
                 self.get_key()
 
+    def current_card(self):
+        return self.stack[self.obj.getIdx()]
+
     def get_key(self):
         """
         Display a card and wait for the input.
@@ -310,23 +340,30 @@ class Display():
             key = self.win.getkey()
             if key == "q":
                 self.leave()
-            elif key in ["l", "KEY_RIGHT"]:
-                self.obj.forward(self.stack)
-                self.obj.setSide(0)
+            elif key in ["h", "KEY_LEFT"]:
+                self.obj.back()
+                self.current_card().setSide(0)
                 self.disp_card()
+            elif key in ["l", "KEY_RIGHT"]:
+                if self.obj.getIdx() + 1 == len(self.stack):
+                    self.disp_menu()
+                else:
+                    self.obj.forward(self.stack)
+                    self.current_card().setSide(0)
+                    self.disp_card()
             elif key in ["j", "k", "KEY_UP", "KEY_DOWN"]:
-                self.obj.flip()
+                self.current_card().flip()
                 self.disp_card()
             elif key in ["i", "/"]:
-                self.stack[self.obj.getIdx()].toggleStar()
+                self.current_card().toggleStar()
                 self.disp_card()
             elif key in ["0", "^", "KEY_HOME"]:
                 self.obj.setIdx(0)
-                self.obj.setSide(0)
+                self.current_card().setSide(0)
                 self.disp_card()
             elif key in ["$", "KEY_END"]:
                 self.obj.setIdx(len(self.stack) - 1)
-                self.obj.setSide(0)
+                self.current_card().setSide(0)
                 self.disp_card()
             elif key in ["H", "?"]:
                 self.disp_help()
@@ -341,8 +378,12 @@ class Display():
         (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.addstr(
+            0,
+            mcols - 16,
+            "STARRED CARDS",
+            curses.color_pair(3) + curses.A_BOLD,
+        )
         self.win.vline(0, mcols - 20, 0, mlines - 2)
         self.win.hline(1, left, 0, mlines)
 
@@ -350,18 +391,22 @@ class Display():
         # TODO: Fix this, some off by one error
         newntotal = self.ntotal()
         if mlines - 5 < len(self.ntotal()):
-            newntotal = self.ntotal()[:mlines - 4]
+            newntotal = self.ntotal()[: mlines - 4]
         elif mlines - 5 == len(self.ntotal()):
-            newntotal = self.ntotal()[:mlines - 3]
-
-        for card in newntotal:
-            for i in enumerate(newntotal):
-                term = i[1][0]
-                if len(i[1][0]) > 18:
-                    term = i[1][0][:18] + "…"
-                self.win.addstr(2 + i[0], left, term)
+            newntotal = self.ntotal()[: mlines - 3]
+
+        for _ in newntotal:
+            for i, card in enumerate(newntotal):
+                term = card.getFront()
+                if len(term) > 18:
+                    term = term + "…"
+                self.win.addstr(2 + i, left, term)
             if not newntotal == self.ntotal():
-                self.win.addstr(mlines - 3, left, f"({len(self.ntotal()) - len(newntotal)} more)")
+                self.win.addstr(
+                    mlines - 3,
+                    left,
+                    f"({len(self.ntotal()) - len(newntotal)} more)",
+                )
                 break
 
         if len(self.ntotal()) == 0: