Sort numbers in game names numerically

Author: joeraz

pysollib/gamedb.py

@@ -21,6 +21,7 @@
 #
 # ---------------------------------------------------------------------------##
 
+import re
 from importlib import util
 
 import pysollib.settings
@@ -848,6 +849,13 @@ def register(self, gi):
             self.callback()
         self._num_games += 1
 
+    def getNaturalSortKey(self, text):
+        # Sort numbers numerically, and strings alphabetically
+        def convert(text):
+            return int(text) if text.isdigit() else text.lower()
+        
+        return [convert(c) for c in re.split(r'(\d+)', text)]
+
     #
     # access games database - we do not expose hidden games
     #
@@ -865,17 +873,17 @@ def getGamesIdSortedByName(self):
         if self.__games_by_name is None:
             l1, l2, l3 = [], [], []
             for id, gi in self.__games.items():
-                name = gi.name .lower()
-                l1.append((name, id))
+                name = gi.name.lower()
+                l1.append((self.getNaturalSortKey(name), id))
                 if gi.name != gi.short_name:
                     name = gi.short_name.lower()
-                l2.append((name, id))
+                l2.append((self.getNaturalSortKey(name), id))
                 for n in gi.altnames:
                     name = n.lower()
-                    l3.append((name, id, n))
-            l1.sort()
-            l2.sort()
-            l3.sort()
+                    l3.append((self.getNaturalSortKey(name), id, n))
+            l1.sort(key=lambda x: x[0])
+            l2.sort(key=lambda x: x[0])
+            l3.sort(key=lambda x: x[0])
             self.__games_by_name = tuple(i[1] for i in l1)
             self.__games_by_short_name = tuple(i[1] for i in l2)
             self.__games_by_altname = tuple(i[1:] for i in l3)

pysollib/tile/selectgame.py

@@ -672,7 +672,7 @@ def performSearch(self):
                 for altname in game.altnames:
                     if self.app.checkSearchString(self.criteria.name, altname):
                         results.append(altname)
-        results.sort(key=lambda x: x.lower())
+        results.sort(key=self.app.gdb.getNaturalSortKey)
         pos = 0
         for result in results:
             self.list.insert(pos, result)