From a073d20af7b73564e094aa8048bd30c2239cf0ab Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Fri, 31 May 2019 18:09:57 +0300
Subject: [PATCH] Refactoring / code cleanup.

See:

* https://en.wikipedia.org/wiki/Code_refactoring

* https://www.refactoring.com/

* https://www.joelonsoftware.com/2002/01/23/rub-a-dub-dub/

Some small optimisations may have slipped in as well.
---
 pysollib/actions.py |  2 +-
 pysollib/app.py     | 12 ++++++++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pysollib/actions.py b/pysollib/actions.py
index febe015c..19fc611a 100644
--- a/pysollib/actions.py
+++ b/pysollib/actions.py
@@ -330,7 +330,7 @@ class PysolMenubar(PysolMenubarTk):
             elif type == 'not played' and won+lost == 0:
                 games.append(gi.id)
         if games:
-            game_id = self.app.getRandomGameId(games)
+            game_id = self.app.chooseRandomOutOfGames(games)
         if game_id and game_id != self.game.id:
             self.game.endGame()
             self.game.quitGame(game_id)
diff --git a/pysollib/app.py b/pysollib/app.py
index d04047a6..2db007d3 100644
--- a/pysollib/app.py
+++ b/pysollib/app.py
@@ -1017,10 +1017,14 @@ Please select a %s type %s.
             return None
         return re.sub(r"[\s]", "_", latin1_normalize(n))
 
-    def getRandomGameId(self, games=None):
-        if games is None:
-            return self.miscrandom.choice(self.gdb.getGamesIdSortedById())
-        return self.miscrandom.choice(games)
+    def _choice(self, lst):
+        return self.miscrandom.choice(lst)
+
+    def chooseRandomOutOfGames(self, games):
+        return self._choice(games)
+
+    def getRandomGameId(self):
+        return self._choice(self.gdb.getGamesIdSortedById())
 
     def getAllUserNames(self):
         names = []