X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdisplay.py;h=0e1c01c7c35a0886cb3722d3e153d879177ab517;hb=7ab4e5b02bfe00a70bc60e18dc5076f74ad0b5aa;hp=d0c24208b5fb11b19b73be81f15e9ede6fb776e6;hpb=a407ed5623d0f4140ac1be54e6179785eb4431ea;p=lightcards.git diff --git a/lightcards/display.py b/lightcards/display.py index d0c2420..0e1c01c 100644 --- a/lightcards/display.py +++ b/lightcards/display.py @@ -19,8 +19,15 @@ def panel_create(x, y): return (win, panel) +class CursesError(BaseException): + def __init__(self, message="lightcards: Curses error!"): + self.message = message + print(self.message) + sys.exit(3) + + class Help: - def __init__(self, outer, mlines=20, mcols=52): + def __init__(self, outer, mlines=21, mcols=52): """Initialize help screen""" self.outer = outer (self.win, self.panel) = panel_create(mlines, mcols) @@ -40,6 +47,7 @@ class Help: "H, ? open this screen", "e open the input file in $EDITOR", "m open the control menu", + "1, 2, 3 switch views", "", "More information can be found in the man page, or", "by running `lightcards --help`.", @@ -76,7 +84,7 @@ class Help: class Menu: - def __init__(self, outer, mlines=17, mcols=44): + def __init__(self, outer, mlines=16, mcols=44): """Initialize the menu with content""" self.outer = outer (self.win, self.panel) = panel_create(mlines, mcols) @@ -94,7 +102,6 @@ class Menu: "[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", @@ -116,10 +123,7 @@ class Menu: else: color = curses.color_pair(1) - for i in range(42): - self.win.addch(15, i + 1, " ") - - self.win.addstr(15, 1, string, color) + self.win.addstr(14, 1, string, color) self.menu_grab() def menu_grab(self): @@ -149,14 +153,6 @@ class Menu: elif key == "z": shuffle(self.outer.stack) self.menu_print("Stack shuffled!") - elif key == "f": - for x in self.outer.stack: - x.front, x.back = x.back, x.front - (self.outer.headers[0], self.outer.headers[1]) = ( - self.outer.headers[1], - self.outer.headers[0], - ) - self.menu_print("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 @@ -182,18 +178,22 @@ class Menu: Display a menu offering multiple options on how to manipulate the deck and to continue """ + for i in range(42): + self.win.addch(14, i + 1, " ") + (mlines, mcols) = self.outer.win.getmaxyx() - self.win.mvwin(int(mlines / 2) - 9, int(mcols / 2) - 21) + self.win.mvwin(int(mlines / 2) - 8, int(mcols / 2) - 22) self.panel.show() self.menu_grab() class Display: - def __init__(self, stack, headers, obj): + def __init__(self, stack, headers, obj, view): self.stack = stack self.headers = headers self.obj = obj + self.view = view def run(self, stdscr): """Set important options that require stdscr before starting""" @@ -262,17 +262,21 @@ class Display: else: star_color = curses.color_pair(1) - # Create bar component + # Compose bar text bar_start = "[" bar_middle = self.current_card().printStar() bar_end = ( f"] [{len(self.nstarred())}/{str(len(self.stack))} starred] " f"[{percent}% (" f"{str(self.obj.index).zfill(len(str(len(self.stack))))}" - f"/{str(len(self.stack))})] [" - f"{self.headers[self.current_card().side]} (" - f"{str(int(self.current_card().side) + 1)})]" + f"/{str(len(self.stack))})]" ) + if self.view != 3: + bar_end += ( + f" [{self.get_side()} (" + f"{str(int(self.current_card().side) + 1)})]" + ) + bar_end += f" [View {str(self.view)}]" # Put it all togethor self.win.addstr(mlines - 1, 0, bar_start, curses.color_pair(1)) @@ -292,55 +296,95 @@ class Display: wrap_width = 80 return wrap_width + def get_side(self): + if self.obj.side == 0: + return self.headers[self.current_card().side] + else: + return self.headers[self.current_card().get_reverse()] + def disp_card(self): - """ - Display the contents of the card. - Shows a header, a horizontal line, and the contents of the current - side. - """ (_, mcols) = self.win.getmaxyx() self.main_panel.bottom() self.win.clear() - - # If on the back of the card, show the content of the front side in - # the header num_done = str(self.obj.index + 1).zfill(len(str(len(self.stack)))) - if self.current_card().side == 0: - top = num_done + " | " + self.headers[self.current_card().side] - else: - top = ( - num_done - + " | " - + self.headers[self.current_card().side] - + ' | "' - + str(self.current_card().front) - + '"' + + if self.view in [1, 2]: + """ + Display the contents of the card. + Shows a header, a horizontal line, and the contents of the current + side. + """ + # If on the back of the card, show the content of the front side in + # the header + if self.view == 1: + self.obj.side = 0 + elif self.view == 2: + self.obj.side = 1 + + if self.current_card().side == 0: + top = num_done + " | " + self.get_side() + else: + top = ( + num_done + + " | " + + self.get_side() + + ' | "' + + str(self.current_card().get()[self.obj.get_reverse()]) + + '"' + ) + + self.win.addstr( + 0, + 0, + textwrap.shorten(top, width=mcols - 20, placeholder="…"), + curses.A_BOLD, ) - header_width = mcols - if mcols > 80: - header_width = 80 + # Show current side + self.win.addstr( + 2, + 0, + textwrap.fill( + self.current_card().get()[self.obj.side], + width=self.wrap_width(), + ), + ) - self.win.addstr( - 0, - 0, - textwrap.shorten(top, width=header_width, placeholder="…"), - curses.A_BOLD, - ) + elif self.view == 3: + """ + Display the contents of the card with both the front and back sides. + """ + (_, mcols) = self.win.getmaxyx() + self.main_panel.bottom() + self.win.clear() - # Add horizontal line - self.win.hline(1, 0, curses.ACS_HLINE, mcols) + self.win.addstr( + 0, + 0, + textwrap.shorten( + num_done, + width=mcols - 20, + placeholder="…", + ), + curses.A_BOLD, + ) - # Show current side - self.win.addstr( - 2, - 0, - textwrap.fill( - self.current_card().get(), - width=self.wrap_width(), - ), - ) + # Show card content + self.win.addstr( + 2, + 0, + textwrap.fill( + self.headers[0] + ": " + self.current_card().front, + width=self.wrap_width(), + ) + + "\n\n" + + textwrap.fill( + self.headers[1] + ": " + self.current_card().back, + width=self.wrap_width(), + ), + ) + self.win.hline(1, 0, curses.ACS_HLINE, mcols) self.disp_bar() self.disp_sidebar() @@ -369,7 +413,7 @@ class Display: self.obj.forward(self.stack) self.current_card().side = 0 self.disp_card() - elif key in ["j", "k", "KEY_UP", "KEY_DOWN"]: + elif key in ["j", "k", "KEY_UP", "KEY_DOWN"] and self.view != 3: self.current_card().flip() self.disp_card() elif key in ["i", "/"]: @@ -390,6 +434,8 @@ class Display: elif key == "e": (self.headers, self.stack) = runner.reparse() self.get_key() + elif key in ["1", "2", "3"]: + self.view = int(key) def disp_sidebar(self): """Display a sidebar with the starred terms""" @@ -405,24 +451,22 @@ class Display: self.win.vline(0, mcols - 20, 0, mlines - 2) nstarred = self.nstarred() - if mlines - 5 < len(self.nstarred()): - nstarred = self.nstarred()[: mlines - 4] - elif mlines - 5 == len(self.nstarred()): - nstarred = self.nstarred()[: mlines - 3] - - for _ in nstarred: - for i, card in enumerate(nstarred): - term = card.front - if len(term) > 18: - term = term + "…" - self.win.addstr(2 + i, left, term) - if not nstarred == self.nstarred(): + for i, card in enumerate(nstarred): + term = card.get()[self.obj.side] + if len(term) > 18: + term = term[:18] + "…" + + if i > mlines - 5: + for i in range(19): + self.win.addch(mlines - 3, left + i, " ") + self.win.addstr( mlines - 3, left, - f"({len(self.nstarred()) - len(nstarred)} more)", + f"({len(nstarred) - i - 2} more)", ) - break + else: + self.win.addstr(2 + i, left, term) if len(self.nstarred()) == 0: self.win.addstr(2, left, "None starred")