^X will remove search history item

Author: s-n-g

README.html

@@ -1403,7 +1403,7 @@ <h2 id="search-function">Search function <span style="padding-left: 10px;"><sup
 <p>The <em>Search Window</em> supports normal and extend editing and in session history.</p>
 <p>One can always get help by pressing the “<strong>?</strong>” key.</p>
 <p>After a search term has been successfully found (search is case insensitive), next occurrence can be obtained using the “<strong>n</strong>” key and previous occurrence can be obtained using the “<strong>N</strong>” key.</p>
-<p>All search widgets provide a “<em>search history</em>” function; pressing the <strong>Up</strong> or <strong>Down</strong> arrow will cycle through previously used search terms (maximum number remembered is 20).</p>
+<p>All search widgets provide a “<em>search history</em>” function; pressing the <strong>Up</strong> or <strong>Down</strong> arrow will cycle through previously used search terms (maximum number remembered is 20). Pressing <strong>^X</strong> will remove an item from the history.</p>
 <h2 id="line-editor">Line editor <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <p><strong>PyRadio</strong> “<em>Search function</em>” and “<em>Station editor</em>” use a <em>Line editor</em> to permit typing and editing stations’ data.</p>
 <p>The <em>Line editor</em> works both on <strong>Python 2</strong> and <strong>Python 3</strong>, but does not provide the same functionality for both versions:</p>

README.md

@@ -552,7 +552,7 @@ One can always get help by pressing the "**?**" key.
 
 After a search term has been successfully found (search is case insensitive), next occurrence can be obtained using the "**n**" key and previous occurrence can be obtained using the "**N**" key.
 
-All search widgets provide a "*search history*" function; pressing the **Up** or **Down** arrow will cycle through previously used search terms (maximum number remembered is 20).
+All search widgets provide a "*search history*" function; pressing the **Up** or **Down** arrow will cycle through previously used search terms (maximum number remembered is 20). Pressing **^X** will remove an item from the history.
 
 ## Line editor
 

pyradio/radio.py

@@ -3125,10 +3125,12 @@ def _show_search_help(self):
             '''
         else:
             txt = '''Left| / |Right        |Move to next / previous character.
+            Up| / |Down           |Cycle within history.
             M-F| / |M-B           |Move to next / previous word.
             HOME|,|^A| / |END|,|^E    |Move to start / end of line.
             ^W| / |M-D|,|^K         |Clear to start / end of line.
             ^U                  |Clear line.
+            ^X                  |Remove history item.
             DEL|,|^D              |Delete character.
             Backspace|,|^H        |Backspace (delete previous character).
             Up|,|^P| / |Down|,|^N     |Get previous / next history item.

pyradio/simple_curses_widgets.py

@@ -3339,7 +3339,7 @@ def __init__(self, parent, width, begin_y, begin_x, **kwargs):
                     ''' callback function for KEY_STAB '''
                     self._key_stab_function_handler = value
                 elif key == 'string_changed_handler':
-                    ''' callback function for KEY_STAB '''
+                    ''' callback function for string change '''
                     self._string_changed_handler = value
                 elif key == 'paste_mode_always_on':
                     ''' set paste mode and never disable it '''
@@ -4080,6 +4080,22 @@ def keypress(self, win, char):
                         self._mode_changed()
             return 2
 
+
+        elif char == curses.ascii.CAN and \
+                self._has_history:
+            self._backslash_pressed = False
+            self._input_history.remove_from_history(self._string)
+            self._string = self._input_history.return_history(0, '')
+            if self.string:
+                if logger.isEnabledFor(logging.DEBUG):
+                    logger.debug('action: CLEAR HISTORY')
+            self._go_to_end()
+            if not self._paste_mode_always_on:
+                if self._use_paste_mode and self._paste_mode:
+                    self._paste_mode = self._disable_paste_mode = False
+                    if self._mode_changed:
+                        self._mode_changed()
+
         elif char in (curses.KEY_ENTER, ord('\n'), ord('\r')):
             ''' ENTER '''
             self._backslash_pressed = False
@@ -4586,6 +4602,21 @@ def add_to_history(self, a_string):
             self._dirty = True
             self._active_history_index = len(self._history)
 
+    def remove_from_history(self, a_string):
+        if a_string:
+            i = [(x, y) for x, y in \
+                    enumerate(self._history) \
+                    if y.lower() == a_string.lower()
+                 ]
+            if i:
+                self._history.pop(i[0][0])
+                self._dirty = True
+                if self._history:
+                    if self._active_history_index == len(self._history):
+                        self._active_history_index -= 1
+                else:
+                    self._active_history_index = -1
+
     def return_history(self, direction, current_string):
         if self._history:
             self._active_history_index += direction
@@ -4594,8 +4625,9 @@ def return_history(self, direction, current_string):
             elif self._active_history_index >= len(self._history):
                 self._active_history_index = 0
             ret = self._history[self._active_history_index]
-            if ret.lower() == current_string.lower():
-                return self.return_history(direction, current_string)
+            if ret and current_string:
+                if ret.lower() == current_string.lower():
+                    return self.return_history(direction, current_string)
             return ret
         return ''