From 9f6704125cc3c62a4ccab66d700f4eaf39a11a30 Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Fri, 12 Feb 2021 11:56:55 -0500 Subject: [PATCH] Change flip cards option to a view --- lightcards/deck.py | 11 +++++++++-- lightcards/display.py | 46 ++++++++++++++++++++----------------------- lightcards/runner.py | 7 ------- man/lightcards.1 | 3 --- man/lightcards.1.md | 3 --- 5 files changed, 30 insertions(+), 40 deletions(-) diff --git a/lightcards/deck.py b/lightcards/deck.py index b522515..abb13a3 100644 --- a/lightcards/deck.py +++ b/lightcards/deck.py @@ -38,9 +38,9 @@ class Card: def get(self): if self.side == 0: - return self.front + return (self.front, self.back) else: - return self.back + return (self.back, self.front) def flip(self): if self.side == 0: @@ -54,6 +54,7 @@ class Status: def __init__(self): self.index = 0 + self.side = 0 def forward(self, stack): if self.index != len(stack): @@ -62,3 +63,9 @@ class Status: def back(self): if not self.index < 1: self.index -= 1 + + def get_reverse(self): + if self.side == 0: + return 1 + else: + return 0 diff --git a/lightcards/display.py b/lightcards/display.py index 9baa267..b167828 100644 --- a/lightcards/display.py +++ b/lightcards/display.py @@ -40,7 +40,7 @@ class Help: "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 +64,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: @@ -77,7 +77,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) @@ -95,7 +95,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", @@ -117,7 +116,7 @@ class Menu: else: color = curses.color_pair(1) - self.win.addstr(15, 1, string, color) + self.win.addstr(14, 1, string, color) self.menu_grab() def menu_grab(self): @@ -147,14 +146,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 @@ -181,10 +172,10 @@ 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() @@ -273,7 +264,7 @@ class Display: f"{str(self.obj.index).zfill(len(str(len(self.stack))))}" f"/{str(len(self.stack))})]" ) - if self.view == 1: + if self.view == 3: bar_end += ( f" [{self.headers[self.current_card().side]} (" f"{str(int(self.current_card().side) + 1)})]" @@ -304,7 +295,7 @@ class Display: 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]: """ Display the contents of the card. Shows a header, a horizontal line, and the contents of the current @@ -312,15 +303,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.headers[self.obj.side] else: top = ( num_done + " | " - + self.headers[self.current_card().side] + + self.headers[self.obj.side] + ' | "' - + str(self.current_card().front) + + str(self.current_card().get()[self.obj.get_reverse()]) + '"' ) @@ -336,12 +332,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 +400,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", "/"]: @@ -425,7 +421,7 @@ class Display: elif key == "e": (self.headers, self.stack) = runner.reparse() self.get_key() - elif key in ["1", "2"]: + elif key in ["1", "2", "3"]: self.view = int(key) def disp_sidebar(self): @@ -443,7 +439,7 @@ class Display: nstarred = self.nstarred() for i, card in enumerate(nstarred): - term = card.front + term = card.get()[self.obj.side] if len(term) > 18: term = term[:18] + "…" diff --git a/lightcards/runner.py b/lightcards/runner.py index f9f1abd..a0c8a09 100644 --- a/lightcards/runner.py +++ b/lightcards/runner.py @@ -25,9 +25,6 @@ def parse_args(): action="store_true", help="alphabetize card order", ) - parser.add_argument( - "-f", "--flip", action="store_true", help="show second column first" - ) parser.add_argument( "-p", "--purge", @@ -71,10 +68,6 @@ def show(args, stack, headers): stack.sort(key=lambda x: x.front) if args.reverse: stack.reverse() - if args.flip: - for x in stack: - x[0], x[1] = x[1], x[0] - headers[0], headers[1] = headers[1], headers[0] # Send to display win = Display(stack, headers, idx) diff --git a/man/lightcards.1 b/man/lightcards.1 index 7bf1cc1..6097ae2 100644 --- a/man/lightcards.1 +++ b/man/lightcards.1 @@ -26,9 +26,6 @@ Print version and exit \f[B]-a\f[R], \f[B]\[en]alphabetize\f[R] Alphabetize card order .TP -\f[B]-f\f[R], \f[B]\[en]flip\f[R] -Show second column first -.TP \f[B]-p\f[R], \f[B]\[en]purge\f[R] Purge cache for chosen set .TP diff --git a/man/lightcards.1.md b/man/lightcards.1.md index 3a0388b..2cdd2b2 100644 --- a/man/lightcards.1.md +++ b/man/lightcards.1.md @@ -27,9 +27,6 @@ lightcards \[options\] \[input file\] **-a**, **--alphabetize** : Alphabetize card order -**-f**, **--flip** -: Show second column first - **-p**, **--purge** : Purge cache for chosen set -- 2.39.2