From 7ab4e5b02bfe00a70bc60e18dc5076f74ad0b5aa Mon Sep 17 00:00:00 2001 From: Armaan Bhojwani Date: Fri, 12 Feb 2021 13:49:05 -0500 Subject: [PATCH] Fix side output in bar and header --- lightcards/deck.py | 6 ++++++ lightcards/display.py | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lightcards/deck.py b/lightcards/deck.py index abb13a3..823946f 100644 --- a/lightcards/deck.py +++ b/lightcards/deck.py @@ -48,6 +48,12 @@ class Card: else: self.side = 0 + def get_reverse(self): + if self.side == 0: + return 1 + else: + return 0 + class Status: """Keeps track of where in the deck the user is""" diff --git a/lightcards/display.py b/lightcards/display.py index 8340c27..0e1c01c 100644 --- a/lightcards/display.py +++ b/lightcards/display.py @@ -271,9 +271,9 @@ class Display: f"{str(self.obj.index).zfill(len(str(len(self.stack))))}" f"/{str(len(self.stack))})]" ) - if self.view == 3: + 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)}]" @@ -296,6 +296,12 @@ 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() @@ -316,12 +322,12 @@ class Display: self.obj.side = 1 if self.current_card().side == 0: - top = num_done + " | " + self.headers[self.obj.side] + top = num_done + " | " + self.get_side() else: top = ( num_done + " | " - + self.headers[self.obj.side] + + self.get_side() + ' | "' + str(self.current_card().get()[self.obj.get_reverse()]) + '"' -- 2.39.2