From fd3c77f0e8a9e27c0123cf5a66026cc358f145ed Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Tue, 9 Feb 2021 21:50:10 -0500 Subject: [PATCH] Resolve TODO and rename ntotal() --- lightcards/display.py | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/lightcards/display.py b/lightcards/display.py index 58a9055..aa121af 100644 --- a/lightcards/display.py +++ b/lightcards/display.py @@ -52,7 +52,7 @@ class Display: progress.dump(self.stack, runner.get_orig()[1]) sys.exit(0) - def ntotal(self): + def nstarred(self): """Get total number of starred cards""" return [card for card in self.stack if card.getStar()] @@ -81,7 +81,7 @@ class Display: bar_start = "[" bar_middle = self.current_card().printStar() bar_end = ( - f"] [{len(self.ntotal())}/{str(len(self.stack))} starred] " + f"] [{len(self.nstarred())}/{str(len(self.stack))} starred] " f"[{percent}% (" f"{str(self.obj.getIdx()).zfill(len(str(len(self.stack))))}" f"/{str(len(self.stack))})] [" @@ -387,27 +387,25 @@ class Display: self.win.vline(0, mcols - 20, 0, mlines - 2) self.win.hline(1, left, 0, mlines) - i = 0 - # TODO: Fix this, some off by one error - newntotal = self.ntotal() - if mlines - 5 < len(self.ntotal()): - newntotal = self.ntotal()[: mlines - 4] - elif mlines - 5 == len(self.ntotal()): - newntotal = self.ntotal()[: 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 newntotal: - for i, card in enumerate(newntotal): + for _ in nstarred: + for i, card in enumerate(nstarred): term = card.getFront() if len(term) > 18: term = term + "…" self.win.addstr(2 + i, left, term) - if not newntotal == self.ntotal(): + if not nstarred == self.nstarred(): self.win.addstr( mlines - 3, left, - f"({len(self.ntotal()) - len(newntotal)} more)", + f"({len(self.nstarred()) - len(nstarred)} more)", ) break - if len(self.ntotal()) == 0: + if len(self.nstarred()) == 0: self.win.addstr(2, left, "None starred") -- 2.39.2