- version 0.9.3.11.9 - 0.9.3.12-beta9

- adding search support for the Keyboard Config Window

Author: s-n-g

Changelog

@@ -1,3 +1,8 @@
+2025-03-21 s-n-g
+    * version 0.9.3.11.9 - 0.9.3.12-beta9
+    * fixing default station selection in the config window
+    * adding search support for both the config window and the shortcuts window
+
 2025-03-19 s-n-g
     * version 0.9.3.11.8 - 0.9.3.12-beta8
     * fixing #281 - Favourite list becomes corrupted after adding station

docs/index.html

@@ -186,6 +186,11 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <pre style="height: 200px;">
 
+2025-03-21 s-n-g
+    * version 0.9.3.11.9 - 0.9.3.12-beta9
+    * fixing default station selection in the config window
+    * adding search support for both the config window and the shortcuts window
+
 2025-03-19 s-n-g
     * version 0.9.3.11.8 - 0.9.3.12-beta8
     * fixing #281 - Favourite list becomes corrupted after adding station

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyradio"
-version = "0.9.3.11.8"
+version = "0.9.3.11.9"
 authors = [
   { name="Ben Dowling", email="[email protected]" },
   { name="Spiros Georgaras", email="[email protected]" },

pyradio/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 " pyradio -- Console radio player. "
 
-version_info = (0, 9, 3, 11, 8)
+version_info = (0, 9, 3, 11, 9)
 
 # Set it to True if new stations have been
 # added to the package's stations.csv

pyradio/config.py

@@ -1366,6 +1366,12 @@ class PyRadioConfig(PyRadioStations):
     ''' True if lock file exists '''
     locked = False
 
+    ''' this is used to inhibit opening the search window
+        currently used by:
+            - PyRadioKeyboardConfig when editing
+    '''
+    inhibit_search = False
+
     _distro = 'None'
     opts = collections.OrderedDict()
     opts['general_title'] = ['General Options', '']
@@ -1385,11 +1391,11 @@ class PyRadioConfig(PyRadioStations):
     opts['connection_timeout'] = ['Connection timeout: ', '10']
     opts['force_http'] = ['Force http connections: ', False]
     opts['buffering'] = ['Buffering (seconds): ', '20']
-    opts['mplayer_save_br'] = ['  MPlayer auto save br: ', False]
+    opts['mplayer_save_br'] = ['MPlayer auto save br: ', False]
     opts['notification'] = ['Notifications', '']
     opts['enable_notifications'] = ['Enable notifications: ', '-1']
-    opts['use_station_icon'] = ['    Use station icon: ', True]
-    opts['remove_station_icons'] = ['    Remove cached icons: ', True]
+    opts['use_station_icon'] = ['  Use station icon: ', True]
+    opts['remove_station_icons'] = ['  Remove cached icons: ', True]
     opts['clock_title'] = ['Clock', '']
     opts['enable_clock'] = ['Display on startup: ', False]
     opts['time_format'] = ['Time format: ', '1']
@@ -1401,7 +1407,7 @@ class PyRadioConfig(PyRadioStations):
     opts['console_theme'] = ['Console theme: ', 'dark']
     opts['mouse_options'] = ['Mouse Support', '']
     opts['enable_mouse'] = ['Enable mouse support: ', False]
-    opts['wheel_adjusts_volume'] = ['    Reverse wheel: ', False]
+    opts['wheel_adjusts_volume'] = ['  Reverse wheel: ', False]
     opts['remote'] = ['Remote Control Server', '']
     opts['remote_control_server_ip'] = ['Server IP: ', 'localhost']
     opts['remote_control_server_port'] = ['Server Port: ', '9998']

pyradio/config_window.py

@@ -316,6 +316,13 @@ def selection(self, val):
             self.__selection = val
         #self.refresh_config_win()
 
+    def get_previous_search(self, string):
+        sel = self.__selection - 1
+        if sel in self._headers and \
+                string in list(self._config_options.values())[sel][0].lower():
+            sel -= 1
+        return sel
+
     def set_selection(self, sel):
         self.selection = sel
         self._put_cursor(0)
@@ -3555,6 +3562,9 @@ class PyRadioKeyboardConfig():
     _start = 0
     _selection = 1
 
+    # titles for search function
+    _titles = None
+
     message = None
 
     def __init__(
@@ -3609,7 +3619,7 @@ def __init__(
                     self._list[i][-2] = header_index
         if logger.isEnabledFor(logging.DEBUG):
             for n in self._list:
-                logger.debug(f'{n}')
+                logger.debug(f'list : {n}')
         '''
 
         # do not read keys.json to self._keys_to_classes
@@ -3630,7 +3640,33 @@ def __init__(
         self._keys_to_classes = self._precompute_context_map(self._classes)
         # logger.error(f'{self._keys_to_classes = }')
         self._needs_update = False
+        # logger.error('\n\ntitles\n{}\n\n'.format(self.titles()))
+
+    @property
+    def editing(self):
+        return self._editing
 
+    @property
+    def selection(self):
+        return self._selection
+
+    @selection.setter
+    def selection(self, value):
+        self._selection = value
+        if self._selection in self._headers:
+            self._selection += 1
+
+    def get_previous_search(self, string):
+        sel = self._selection - 1
+        if string.lower() in self._list[sel][-1].lower() and \
+                sel in self._headers:
+            sel -= 1
+        return sel
+
+    def titles(self):
+        if self._titles is None:
+            self._titles = [x[-1] for x in self._list]
+        return self._titles
 
     def _precompute_context_map(self, results):
         """
@@ -3681,17 +3717,18 @@ def _rename_keyboard_json_file(self, file_path):
         return new_file_name
 
     def _start_editing(self):
-        self.existing_conflict = None
         self._win.addstr(self._selection - self._start + 2, self.maxX-8, '[edit]', curses.color_pair(6))
         self._win.refresh()
         self._editing = True
+        self._cnf.inhibit_search = True
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug('editing "{}"'.format(self._list[self._selection]))
 
     def _stop_editing(self):
         self._win.addstr(self._selection - self._start + 2, self.maxX-8, '      ', curses.color_pair(6))
         self._win.refresh()
         self._editing = False
+        self._cnf.inhibit_search = False
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug('edited "{}"'.format(self._list[self._selection]))
 
@@ -3891,6 +3928,10 @@ def _make_selection_visible(self):
         elif chk > self._number_of_lines:
             self._start = max(0, int((self._selection - self._number_of_lines) / 2))
 
+    def set_selection(self, sel):
+        self.selection = sel
+        self._go_to_line(self._selection)
+
     def _go_to_line(self, a_line):
         self._selection = a_line
         self._make_selection_visible()
@@ -4018,6 +4059,7 @@ def _detect_conflict(self, modified_item):
         """
         # reset self.existing_conflict ; None means no conflict
         self.existing_conflict = None
+        logger.error(f'2 {self.existing_conflict = }')
 
         # Extract key and the new shortcut code from the modified item
         key = modified_item[0]  # Identifier for the shortcut (e.g., "reload", "mute")
@@ -4059,13 +4101,18 @@ def _detect_conflict(self, modified_item):
             if key_in_context == key:
                 continue
 
-            idx, chk = [(i, x) for i, x in enumerate(self._list) if x[0] == key_in_context][0]
-            if logger.isEnabledFor(logging.DEBUG):
-                logger.debug('\n\nitem with key  -  {0}: {1}\n\n'.format(idx, chk))
-            # Check if the new shortcut code matches the existing shortcut code for any other key
-            if chk[3] == new_shortcut_code:
-                self.existing_conflict = (modified_item[-3], idx)  # Return the first conflicting key and index
-                return
+            try:
+                idx, chk = [(i, x) for i, x in enumerate(self._list) if x[0] == key_in_context][0]
+                if logger.isEnabledFor(logging.DEBUG):
+                    logger.debug('\n\nitem with key  -  {}: {}, new_shortcut_code = {}\n\n'.format(idx, chk, new_shortcut_code))
+
+                # Check if the new shortcut code matches the existing shortcut code for any other key
+                if chk[3] == new_shortcut_code:
+                    self.existing_conflict = (modified_item[-3], idx)  # Return the first conflicting key and index
+                    logger.debug(f'{self.existing_conflict = }')
+                    return
+            except IndexError:
+                pass
 
         if logger.isEnabledFor(logging.DEBUG):
             logger.debug('\n-*-*-*-*-*-*-*-*- None 2\n\n')
@@ -4143,8 +4190,10 @@ def keypress(self, char):
         l_char = None
         self._needs_update = False
         if char == ord('0'):
+            logger.error(f'{self.existing_conflict = }')
             if self.existing_conflict:
                 self._editing = False
+                self._cnf.inhibit_search = False
                 if self._selection == self.existing_conflict[0]:
                     self._go_to_line(self.existing_conflict[1])
                 else:

pyradio/install.py

@@ -17,7 +17,7 @@
 ''' This is PyRadio version this
     install.py was released for
 '''
-PyRadioInstallPyReleaseVersion = '0.9.3.11.8'
+PyRadioInstallPyReleaseVersion = '0.9.3.11.9'
 
 locale.setlocale(locale.LC_ALL, "")
 

pyradio/messages_system.py

@@ -854,6 +854,7 @@ def set_text(self, parent, *args):
 {g}|, |Home| / |{G}|, |End                      |*| Jump to first / last option.
 Enter|, |{pause}|, |Right|, |{l}                |*| Change option value.
 {revert_saved}                                  |*| Revert to saved values.
+{search} |/ |{search_next}| / |{search_prev}    |*|  Search, go to next / previous result.
 {revert_def}                                    |*| Load default values.
 {s}                                             |*| Save config.
 Esc|, |{q}|, |Left|, |{h}                       |*| Cancel.
@@ -1480,6 +1481,7 @@ def set_text(self, parent, *args):
 __|Tab|, |{tab}| / |Sh-Tab|, |{stab}|    |*| Move to next / previous field.
 __|{g}| / |{G}|                          |*| Go to top / bottom of the list.
 __|[| / |]|                              |*| Move between sections.
+__{search} |/ |{search_next}| / |{search_prev}    |*|  Search, go to next / previous result.
 __|{revert_def}| / |{revert_saved}|      |*| Revert to default / saved shortcuts.
 __|x|                                    |*| Revert current item to saved value.
 __|f|                                    |*| Show |free| keys.