X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdisplay.py;h=50b741808b14dc0ed18ed417c528322ac83cb2f1;hb=b3a470553937ee816bf585bee5a1466bb0d8a28b;hp=0e07f9ded03d9cfa449f33664032ec3efdd06262;hpb=01fe4c5f344e355fa9b4ceb032757032b90d3680;p=lightcards.git diff --git a/lightcards/display.py b/lightcards/display.py index 0e07f9d..50b7418 100644 --- a/lightcards/display.py +++ b/lightcards/display.py @@ -3,12 +3,13 @@ import curses import curses.panel +import os from random import shuffle import sys import textwrap import time -from . import runner, progress +from . import runner, progress, parse def panel_create(x, y): @@ -19,8 +20,48 @@ 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 Quit: + def __init__(self, outer, mlines=5, mcols=20): + self.outer = outer + (self.win, self.panel) = panel_create(mlines, mcols) + self.panel.top() + self.panel.hide() + + self.win.addstr( + 1, + 2, + "QUIT LIGHTCARDS?", + curses.color_pair(1) + curses.A_BOLD, + ) + self.win.hline(2, 1, curses.ACS_HLINE, mcols) + self.win.addstr(3, 1, "Quit? [y/n]") + + self.win.box() + + def disp(self): + """Display quit confirmation screen""" + (mlines, mcols) = self.outer.win.getmaxyx() + self.win.mvwin(int(mlines / 2) - 3, int(mcols / 2) - 10) + self.panel.show() + + while True: + key = self.win.getkey() + if key == "y": + break + elif key == "n": + self.panel.hide() + self.outer.get_key() + + class Help: - def __init__(self, outer, mlines=21, mcols=52): + def __init__(self, outer, mlines=20, mcols=52): """Initialize help screen""" self.outer = outer (self.win, self.panel) = panel_create(mlines, mcols) @@ -38,9 +79,8 @@ class Help: "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", - "1, 2 switch views", + "1, 2, 3 switch views", "", "More information can be found in the man page, or", "by running `lightcards --help`.", @@ -64,7 +104,7 @@ class Help: def disp(self): """Display help screen""" (mlines, mcols) = self.outer.win.getmaxyx() - self.win.mvwin(int(mlines / 2) - 11, int(mcols / 2) - 25) + self.win.mvwin(int(mlines / 2) - 10, int(mcols / 2) - 25) self.panel.show() while True: @@ -95,11 +135,11 @@ 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", "[s]: update stack to include starred only", + "[e]: open the input file in $EDITOR", "", "[r]: restart", "[m]: close menu", @@ -147,14 +187,13 @@ 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], + elif key == "e": + curses.endwin() + os.system(f"$EDITOR {self.outer.input_file}"), + (self.outer.headers, self.outer.stack) = parse.parse_html( + parse.md2html(self.outer.input_file) ) - self.menu_print("Cards flipped!") + self.outer.get_key() 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 @@ -181,21 +220,22 @@ class Menu: and to continue """ for i in range(42): - self.win.addch(15, i + 1, " ") + 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, input_file): self.stack = stack self.headers = headers self.obj = obj - self.view = 1 + self.view = view + self.input_file = input_file def run(self, stdscr): """Set important options that require stdscr before starting""" @@ -209,6 +249,7 @@ class Display: self.main_panel = curses.panel.new_panel(self.win) self.menu_obj = Menu(self) self.help_obj = Help(self) + self.quit_obj = Quit(self) self.get_key() @@ -231,7 +272,8 @@ class Display: self.disp_card() def leave(self): - """Pickle stack before quitting""" + """Pickle stack and confirm before quitting""" + self.quit_obj.disp() if self.obj.index + 1 == len(self.stack): self.obj.index = 0 @@ -248,7 +290,7 @@ class Display: status, and card side. """ (mlines, mcols) = self.win.getmaxyx() - self.win.hline(mlines - 2, 0, 0, mcols) + self.win.hline(mlines - 3, 0, 0, mcols) # Calculate percent done if len(self.stack) <= 1: @@ -267,29 +309,52 @@ class Display: # 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))})]" - ) - if self.view == 1: + bar_end = f"] [{len(self.nstarred())}/{str(len(self.stack))} starred] " + if self.view != 3: bar_end += ( - f" [{self.headers[self.current_card().side]} (" + 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)) - self.win.addstr(mlines - 1, len(bar_start), bar_middle, star_color) + height = mlines - 2 + self.win.addstr(height, 0, bar_start, curses.color_pair(1)) + self.win.addstr(height, len(bar_start), bar_middle, star_color) self.win.addstr( - mlines - 1, + height, len(bar_start + bar_middle), textwrap.shorten(bar_end, width=mcols - 20, placeholder="…"), curses.color_pair(1), ) + progress = ( + f"[{percent}% (" + f"{str(self.obj.index + 1).zfill(len(str(len(self.stack))))}" + f"/{str(len(self.stack))})] " + ) + + self.win.addstr( + height + 1, + 0, + progress, + curses.color_pair(1), + ) + + for i in range( + int( + self.obj.index + / (len(self.stack) - 1) + * (mcols - len(progress)) + - 1 + ) + ): + # TODO: Use the variying width unicode block characters to make a + # super accurate bar + self.win.addch( + height + 1, i + len(progress), "»", curses.color_pair(1) + ) + def wrap_width(self): """Calculate the width at which the body text should wrap""" (_, mcols) = self.win.getmaxyx() @@ -298,13 +363,19 @@ 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): (_, mcols) = self.win.getmaxyx() self.main_panel.bottom() self.win.clear() num_done = str(self.obj.index + 1).zfill(len(str(len(self.stack)))) - if self.view == 1: + if self.view in [1, 2, 4]: """ Display the contents of the card. Shows a header, a horizontal line, and the contents of the current @@ -312,15 +383,20 @@ class Display: """ # 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.headers[self.current_card().side] + top = num_done + " | " + self.get_side() else: top = ( num_done + " | " - + self.headers[self.current_card().side] + + self.get_side() + ' | "' - + str(self.current_card().front) + + str(self.current_card().get()[self.obj.get_reverse()]) + '"' ) @@ -336,12 +412,12 @@ class Display: 2, 0, textwrap.fill( - self.current_card().get(), + self.current_card().get()[self.obj.side], width=self.wrap_width(), ), ) - elif self.view == 2: + elif self.view == 3: """ Display the contents of the card with both the front and back sides. """ @@ -404,7 +480,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"] and self.view == 1: + elif key in ["j", "k", "KEY_UP", "KEY_DOWN"] and self.view != 3: self.current_card().flip() self.disp_card() elif key in ["i", "/"]: @@ -422,10 +498,7 @@ class Display: self.help_obj.disp() elif key == "m": self.menu_obj.disp() - elif key == "e": - (self.headers, self.stack) = runner.reparse() - self.get_key() - elif key in ["1", "2"]: + elif key in ["1", "2", "3", "4"]: self.view = int(key) def disp_sidebar(self): @@ -439,27 +512,25 @@ class Display: "STARRED CARDS", curses.color_pair(3) + curses.A_BOLD, ) - self.win.vline(0, mcols - 20, 0, mlines - 2) + self.win.vline(0, mcols - 20, 0, mlines - 3) 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 - 6: + for i in range(19): + self.win.addch(mlines - 3, left + i, " ") + self.win.addstr( - mlines - 3, + mlines - 4, 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")