Remove setter and getter methods

Java coming back to bite me again

diff --git a/lightcards/deck.py b/lightcards/deck.py
index 110c5b4fdcee15ab50a27c5eca2ea52dfa3a0ee7..b522515ae6ae282fd241c6ca612d5f856e1e0309 100644 (file)
--- a/lightcards/deck.py
+++ b/lightcards/deck.py
@@ -30,30 +30,18 @@ class Card:
         else:
             self.starred = True
 
-    def getStar(self):
-        return self.starred
-
     def printStar(self):
         if self.starred:
             return "★ Starred ★"
         else:
             return "Not starred"
 
-    def setSide(self, inp):
-        self.side = inp
-
-    def getSide(self):
-        return self.side
-
     def get(self):
         if self.side == 0:
             return self.front
         else:
             return self.back
 
-    def getFront(self):
-        return self.front
-
     def flip(self):
         if self.side == 0:
             self.side = 1
@@ -74,9 +62,3 @@ class Status:
     def back(self):
         if not self.index < 1:
             self.index -= 1
-
-    def setIdx(self, inp):
-        self.index = inp
-
-    def getIdx(self):
-        return self.index

diff --git a/lightcards/display.py b/lightcards/display.py
index d0c42fa6d04f45fc0503e9245af93c5e73cb722e..f51259396cd04cd2587cbdf92f993267531159aa 100644 (file)
--- a/lightcards/display.py
+++ b/lightcards/display.py
@@ -160,22 +160,22 @@ class Menu:
                 # if not, don't allow to proceed and show an error message
                 cont = False
                 for x in self.outer.stack:
-                    if x.getStar():
+                    if x.starred:
                         cont = True
                         break
 
                 if cont:
                     self.outer.stack = [
-                        x for x in self.outer.stack if x.getStar()
+                        x for x in self.outer.stack if x.starred
                     ]
                     self.menu_print("Stars only!")
                 else:
                     self.menu_print("ERR: None are starred!", err=True)
             elif key in ["h", "KEY_LEFT"]:
-                self.outer.obj.setIdx(len(self.outer.stack) - 1)
+                self.outer.obj.index = len(self.outer.stack) - 1
                 self.outer.get_key()
             elif key == "r":
-                self.outer.obj.setIdx(0)
+                self.outer.obj.index = 0
                 self.outer.get_key()
 
     def disp(self):
@@ -220,15 +220,15 @@ class Display:
 
     def leave(self):
         """Pickle stack before quitting"""
-        if self.obj.getIdx() + 1 == len(self.stack):
-            self.obj.setIdx(0)
+        if self.obj.index + 1 == len(self.stack):
+            self.obj.index = 0
 
         progress.dump(self.stack, runner.get_orig()[1])
         sys.exit(0)
 
     def nstarred(self):
         """Get total number of starred cards"""
-        return [card for card in self.stack if card.getStar()]
+        return [card for card in self.stack if card.starred]
 
     def disp_bar(self):
         """
@@ -242,11 +242,11 @@ class Display:
             percent = "100"
         else:
             percent = str(
-                round(self.obj.getIdx() / (len(self.stack) - 1) * 100)
+                round(self.obj.index / (len(self.stack) - 1) * 100)
             ).zfill(2)
 
         # Print yellow if starred
-        if self.current_card().getStar():
+        if self.current_card().starred:
             star_color = curses.color_pair(3)
         else:
             star_color = curses.color_pair(1)
@@ -257,10 +257,10 @@ class Display:
         bar_end = (
             f"] [{len(self.nstarred())}/{str(len(self.stack))} starred] "
             f"[{percent}% ("
-            f"{str(self.obj.getIdx()).zfill(len(str(len(self.stack))))}"
+            f"{str(self.obj.index).zfill(len(str(len(self.stack))))}"
             f"/{str(len(self.stack))})] ["
-            f"{self.headers[self.current_card().getSide()]} ("
-            f"{str(int(self.current_card().getSide()) + 1)})]"
+            f"{self.headers[self.current_card().side]} ("
+            f"{str(int(self.current_card().side) + 1)})]"
         )
 
         # Put it all togethor
@@ -292,18 +292,16 @@ class Display:
         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()]
-            )
+        num_done = str(self.obj.index + 1).zfill(len(str(len(self.stack))))
+        if self.current_card().side == 0:
+            top = num_done + " | " + self.headers[self.current_card().side]
         else:
             top = (
                 num_done
                 + " | "
-                + self.headers[self.current_card().getSide()]
+                + self.headers[self.current_card().side]
                 + ' | "'
-                + str(self.current_card().getFront())
+                + str(self.current_card().front)
                 + '"'
             )
         header_width = mcols
@@ -339,7 +337,7 @@ class Display:
 
     def current_card(self):
         """Get current card object"""
-        return self.stack[self.obj.getIdx()]
+        return self.stack[self.obj.index]
 
     def get_key(self):
         """
@@ -353,14 +351,14 @@ class Display:
                 self.leave()
             elif key in ["h", "KEY_LEFT"]:
                 self.obj.back()
-                self.current_card().setSide(0)
+                self.current_card().side = 0
                 self.disp_card()
             elif key in ["l", "KEY_RIGHT"]:
-                if self.obj.getIdx() + 1 == len(self.stack):
+                if self.obj.index + 1 == len(self.stack):
                     self.menu_obj.disp()
                 else:
                     self.obj.forward(self.stack)
-                    self.current_card().setSide(0)
+                    self.current_card().side = 0
                     self.disp_card()
             elif key in ["j", "k", "KEY_UP", "KEY_DOWN"]:
                 self.current_card().flip()
@@ -369,12 +367,12 @@ class Display:
                 self.current_card().toggleStar()
                 self.disp_card()
             elif key in ["0", "^", "KEY_HOME"]:
-                self.obj.setIdx(0)
-                self.current_card().setSide(0)
+                self.obj.index = 0
+                self.current_card().side = 0
                 self.disp_card()
             elif key in ["$", "KEY_END"]:
-                self.obj.setIdx(len(self.stack) - 1)
-                self.current_card().setSide(0)
+                self.obj.index = len(self.stack) - 1
+                self.current_card().side = 0
                 self.disp_card()
             elif key in ["H", "?"]:
                 self.help_obj.disp()
@@ -406,7 +404,7 @@ class Display:
 
         for _ in nstarred:
             for i, card in enumerate(nstarred):
-                term = card.getFront()
+                term = card.front
                 if len(term) > 18:
                     term = term + "…"
                 self.win.addstr(2 + i, left, term)