]> git.armaanb.net Git - lightcards.git/commitdiff
Fix side output in bar and header
authorArmaan Bhojwani <me@armaanb.net>
Fri, 12 Feb 2021 18:49:05 +0000 (13:49 -0500)
committerArmaan Bhojwani <me@armaanb.net>
Fri, 12 Feb 2021 18:49:05 +0000 (13:49 -0500)
lightcards/deck.py
lightcards/display.py

index abb13a3804b53b7fb01a8d1856db3f3552bcaf60..823946f0266c35e7f4c3c86e33271e4ec3823980 100644 (file)
@@ -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"""
index 8340c272cdc3349bdd30d4d9460108bed3c5217a..0e1c01c7c35a0886cb3722d3e153d879177ab517 100644 (file)
@@ -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()])
                     + '"'