game search: match against XML display names, not just filenames

Arcade-type systems use ROM filenames (e.g. sf2.zip) with proper display names in XML files. Search function now checks display names from XML in addition to filenames. Also makes XML file discovery generic instead of hardcoding miyoogamelist.xml.

Author: Sundownersport

App/PyUI/main-ui/games/utils/rom_utils.py

@@ -30,7 +30,14 @@ def _get_valid_suffix(self, system):
     #TODO do a git system device file so we can geneically
     #support other formats/systems
     def get_miyoo_games_file(self,system):
-        return os.path.join(self.roms_path, self.get_roms_dir_for_emu_dir(system),"miyoogamelist.xml")
+        system_dir = os.path.join(self.roms_path, self.get_roms_dir_for_emu_dir(system))
+        try:
+            for entry in os.scandir(system_dir):
+                if entry.is_file() and entry.name.endswith('.xml'):
+                    return entry.path
+        except OSError:
+            pass
+        return ""
 
     def has_roms(self, game_system, directory = None):
         directories_to_search = []

App/PyUI/main-ui/menus/games/just_games_menu.py

@@ -12,7 +12,7 @@ class JustGamesMenu(RomsMenuCommon):
     def __init__(self):
         super().__init__()
 
-    def include_rom(self,rom_file_name, rom_file_path):
+    def include_rom(self,rom_file_name, rom_file_path, display_name=""):
         return not os.path.isdir(rom_file_path)
 
     def _get_rom_list(self) -> list[GridOrListEntry]:

App/PyUI/main-ui/menus/games/search_games_for_system_menu.py

@@ -14,8 +14,8 @@ def __init__(self, game_system : GameSystem, search_str):
         self.game_system = game_system
         self.search_str = search_str
 
-    def include_rom(self,rom_file_name, rom_file_path):
-        return self.search_str in rom_file_name.upper() or os.path.isdir(rom_file_path)
+    def include_rom(self,rom_file_name, rom_file_path, display_name=""):
+        return self.search_str in rom_file_name.upper() or self.search_str in display_name.upper() or os.path.isdir(rom_file_path)
 
     def _get_rom_list(self) -> list[GridOrListEntry]:
         roms = []
@@ -39,7 +39,7 @@ def _collect_roms_recursively(game_system, directory=None):
                     # Recurse into subdirectory
                     sub_roms = _collect_roms_recursively(game_system, rom_path)
                     all_roms.extend(sub_roms)
-                    if(self.search_str in rom_name.upper()):
+                    if(self.search_str in rom_name.upper() or self.search_str in entry.get_primary_text().upper()):
                         all_roms.append(entry)
                 else:
                     all_roms.append(entry)

App/PyUI/main-ui/menus/games/searched_roms_menu.py

@@ -12,8 +12,8 @@ def __init__(self, search_str):
         super().__init__()
         self.search_str = search_str
 
-    def include_rom(self,rom_file_name, rom_file_path):
-        return self.search_str in rom_file_name.upper() or os.path.isdir(rom_file_path)
+    def include_rom(self,rom_file_name, rom_file_path, display_name=""):
+        return self.search_str in rom_file_name.upper() or self.search_str in display_name.upper() or os.path.isdir(rom_file_path)
 
     def _get_rom_list(self) -> list[GridOrListEntry]:
         roms = []
@@ -38,7 +38,7 @@ def _collect_roms_recursively(game_system, directory=None):
                     # Recurse into subdirectory
                     sub_roms = _collect_roms_recursively(game_system, rom_path)
                     all_roms.extend(sub_roms)
-                    if(self.search_str in rom_name.upper()):
+                    if(self.search_str in rom_name.upper() or self.search_str in entry.get_primary_text().upper()):
                         all_roms.append(entry)
                 else:
                     all_roms.append(entry)

App/PyUI/main-ui/menus/games/utils/rom_select_options_builder.py

@@ -268,7 +268,7 @@ def _get_favorite_icon(self, rom_info: RomInfo) -> str:
             return None
 
 
-    def build_rom_list(self, game_system,filter: Callable[[str, str], bool] = lambda a,b: True, subfolder = None,
+    def build_rom_list(self, game_system,filter: Callable[[str, str, str], bool] = lambda a,b,c: True, subfolder = None,
                        prefer_savestate_screenshot: bool = False) -> list[GridOrListEntry]:
         file_rom_list = []
         folder_rom_list = []
@@ -280,11 +280,11 @@ def build_rom_list(self, game_system,filter: Callable[[str, str], bool] = lambda
         for rom_file_path in valid_files:
             rom_file_name = os.path.basename(rom_file_path)
             game_entry = miyoo_game_list.get_by_file_path(rom_file_path)
-            if(filter(rom_file_name, rom_file_path)):
-                if(game_entry is not None):
-                    display_name = game_entry.name
-                else:
-                    display_name = RomFileNameUtils.get_rom_name_without_extensions(game_system,rom_file_path)
+            if(game_entry is not None):
+                display_name = game_entry.name
+            else:
+                display_name = RomFileNameUtils.get_rom_name_without_extensions(game_system,rom_file_path)
+            if(filter(rom_file_name, rom_file_path, display_name)):
 
                 rom_info = RomInfo(game_system,rom_file_path, display_name)
 
@@ -302,11 +302,11 @@ def build_rom_list(self, game_system,filter: Callable[[str, str], bool] = lambda
         for rom_file_path in valid_folders:
             rom_file_name = os.path.basename(rom_file_path)
             game_entry = miyoo_game_list.get_by_file_path(rom_file_path)
-            if(filter(rom_file_name, rom_file_path)):
-                if(game_entry is not None):
-                    display_name = game_entry.name
-                else:
-                    display_name = rom_file_name
+            if(game_entry is not None):
+                display_name = game_entry.name
+            else:
+                display_name = rom_file_name
+            if(filter(rom_file_name, rom_file_path, display_name)):
 
                 rom_info = RomInfo(game_system, rom_file_path, display_name)