X-Git-Url: https://git.armaanb.net/?a=blobdiff_plain;f=lightcards%2Fdisplay.py;h=2a25354fa995ad2a0f0d7405e7b2d243935afdaf;hb=3c884626432e00720894132ec86e378f1b92d6ef;hp=ecdc0704ad99a9f33820f6c00bdfbcabe17f0389;hpb=7fc79f3415682ddda1e33d229aaac4db2f36e012;p=lightcards.git diff --git a/lightcards/display.py b/lightcards/display.py index ecdc070..2a25354 100644 --- 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: @@ -44,10 +44,10 @@ 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()) + progress.dump(self.stack, runner.get_orig()) sys.exit(0) def ntotal(self): @@ -70,21 +70,21 @@ class Display: ).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_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.obj.getSide()]} (" - + f"{str(self.obj.getSide() + 1)})] " + + f"{self.headers[self.current_card().getSide()]} (" + + f"{str(self.current_card().getSide()) + str(1)})] " ) # Put it all togethor @@ -119,13 +119,13 @@ 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": - self.stack = lightcards.get_orig()[1] + self.stack = runner.get_orig()[1] self.menu_print("Stack reset!") elif key == "a": self.stack.sort() @@ -231,53 +231,50 @@ class Display: side. """ (mlines, mcols) = self.win.getmaxyx() - if self.obj.getIdx() == len(self.stack): - self.disp_menu() - 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))) + 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()] ) - 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, + else: + top = ( + num_done + + " | " + + self.headers[self.current_card().getSide()] + + ' | "' + + str(self.current_card().getFront()) + + '"' ) + header_width = mcols + if mcols > 80: + header_width = 80 - # 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(), - ), - ) + 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() @@ -294,7 +291,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", @@ -329,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. @@ -342,32 +342,35 @@ class Display: self.leave() elif key in ["h", "KEY_LEFT"]: self.obj.back() - self.obj.setSide(0) + self.current_card().setSide(0) self.disp_card() elif key in ["l", "KEY_RIGHT"]: - self.obj.forward(self.stack) - self.obj.setSide(0) - self.disp_card() + 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() 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): @@ -392,12 +395,12 @@ class Display: 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) + 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,