adding search function for Group Selection window

Author: s-n-g

pyradio/radio.py

@@ -482,6 +482,7 @@ def __init__(self, pyradio_config,
             self.ws.SEARCH_THEME_MODE: self._redisplay_search_show,
             self.ws.SEARCH_SELECT_STATION_MODE: self._redisplay_search_show,
             self.ws.SEARCH_SELECT_PLAYLIST_MODE: self._redisplay_search_show,
+            self.ws.GROUP_SEARCH_MODE: self._redisplay_search_show,
             self.ws.THEME_MODE: self._redisplay_theme_mode,
             self.ws.PLAYLIST_RECOVERY_ERROR_MODE: self._print_playlist_recovery_error,
             self.ws.ASK_TO_CREATE_NEW_THEME_MODE: self._redisplay_ask_to_create_new_theme,
@@ -585,7 +586,7 @@ def __init__(self, pyradio_config,
             1 - playlist search
             2 - theme search
         '''
-        self._search_classes = [None, None, None, None]
+        self._search_classes = [None, None, None, None, None]
 
         ''' points to list in which the search will be performed '''
         self._search_list = []
@@ -598,6 +599,7 @@ def __init__(self, pyradio_config,
             self.ws.SELECT_PLAYLIST_MODE: 1,
             self.ws.THEME_MODE: 2,
             self.ws.PASTE_MODE: 3,
+            self.ws.GROUP_SELECTION_MODE: 4,
         }
 
         ''' which search mode opens from each allowed mode '''
@@ -608,6 +610,7 @@ def __init__(self, pyradio_config,
             self.ws.SELECT_PLAYLIST_MODE: self.ws.SEARCH_SELECT_PLAYLIST_MODE,
             self.ws.PASTE_MODE: self.ws.SEARCH_SELECT_PLAYLIST_MODE,
             self.ws.SELECT_STATION_MODE: self.ws.SEARCH_SELECT_STATION_MODE,
+            self.ws.GROUP_SELECTION_MODE: self.ws.GROUP_SEARCH_MODE,
         }
 
         ''' search modes opened from main windows '''
@@ -5038,6 +5041,8 @@ def _apply_main_windows(ret):
                 self._playlist_select_win.setPlaylistById(ret, adjust=True)
             elif self.ws.operation_mode == self.ws.SELECT_STATION_MODE:
                 self._station_select_win.setPlaylistById(ret, adjust=True)
+            elif self.ws.operation_mode in (self.ws.GROUP_SELECTION_MODE, self.ws.GROUP_SEARCH_MODE):
+                self._group_selection_window.selection = ret
             self.refreshBody()
 
         else:
@@ -5050,6 +5055,8 @@ def _apply_main_windows(ret):
                 self._playlist_select_win.setPlaylistById(ret, adjust=True)
             elif self.ws.previous_operation_mode == self.ws.SELECT_STATION_MODE:
                 self._station_select_win.setPlaylistById(ret, adjust=True)
+            elif self.ws.operation_mode in (self.ws.GROUP_SELECTION_MODE, self.ws.GROUP_SEARCH_MODE):
+                self._group_selection_window.selection = ret
             self.ws.close_window()
             self.refreshBody()
 
@@ -6699,27 +6706,6 @@ def keypress(self, char):
             self._update_stations_result()
             return
 
-        elif self.ws.operation_mode == self.ws.GROUP_SELECTION_MODE:
-            ret = self._group_selection_window.keypress(char)
-            if ret <= 0:
-                if ret == 0:
-                    ret = self._groups[self._group_selection_window.selection][0]
-                    self.setStation(ret)
-                    self._put_selection_in_the_middle(force=True)
-                    self.refreshBody()
-                    self.selections[self.ws.NORMAL_MODE] = [self.selection,
-                                                            self.startPos,
-                                                            self.playing,
-                                                            self.stations]
-                self._group_selection_window = None
-                self._groups = None
-                self.ws.close_window()
-                self.refreshBody()
-            elif ret == 2:
-                ''' show help '''
-                pass
-            return
-
         elif self.ws.operation_mode == self.ws.CHANGE_PLAYER_MODE:
             ret = self._change_player.keypress(char)
             if ret is None:
@@ -7757,6 +7743,27 @@ def keypress(self, char):
                 self.refreshBody()
             return
 
+        elif self.ws.operation_mode == self.ws.GROUP_SELECTION_MODE:
+            ret = self._group_selection_window.keypress(char)
+            if ret <= 0:
+                if ret == 0:
+                    ret = self._groups[self._group_selection_window.selection][0]
+                    self.setStation(ret)
+                    self._put_selection_in_the_middle(force=True)
+                    self.refreshBody()
+                    self.selections[self.ws.NORMAL_MODE] = [self.selection,
+                                                            self.startPos,
+                                                            self.playing,
+                                                            self.stations]
+                self._group_selection_window = None
+                self._groups = None
+                self.ws.close_window()
+                self.refreshBody()
+            elif ret == 2:
+                ''' show help '''
+                pass
+            return
+
         elif self.ws.operation_mode == self.ws.UPDATE_NOTIFICATION_OK_MODE:
             if char in self._global_functions.keys():
                 self._global_functions[char]()
@@ -7807,6 +7814,9 @@ def keypress(self, char):
             elif self.ws.operation_mode == self.ws.SELECT_STATION_MODE:
                 self._search_list = self._station_select_win._items
                 sel = self._station_select_win._selected_playlist_id + 1
+            elif self.ws.operation_mode == self.ws.GROUP_SELECTION_MODE:
+                self._search_list = self._group_selection_window._items
+                sel = self._group_selection_window.selection + 1
 
             if self.search.string:
                 if sel == len(self._search_list):
@@ -7845,6 +7855,9 @@ def keypress(self, char):
             elif self.ws.operation_mode == self.ws.SELECT_STATION_MODE:
                 self._search_list = self._station_select_win._items
                 sel = self._station_select_win._selected_playlist_id - 1
+            elif self.ws.operation_mode == self.ws.GROUP_SELECTION_MODE:
+                self._search_list = self._group_selection_window._items
+                sel = self._group_selection_window.selection - 1
 
             if self.search.string:
                 if sel < 0:
@@ -7883,6 +7896,9 @@ def keypress(self, char):
                 elif self.ws.previous_operation_mode == self.ws.SELECT_STATION_MODE:
                     self._search_list = self._station_select_win._items
                     sel = self._station_select_win._selected_playlist_id + 1
+                elif self.ws.previous_operation_mode == self.ws.GROUP_SELECTION_MODE:
+                    self._search_list = self._group_selection_window._items
+                    sel = self._group_selection_window.selection + 1
 
                 ''' perform search '''
                 if sel == len(self._search_list):

pyradio/simple_curses_widgets.py

@@ -1818,12 +1818,13 @@ def _set_selection(self, a_sel):
             self._old_start_pos = self._start_pos
 
             self._selection = a_sel
+            self._make_sure_selection_is_visible()
             self._verify_selection_not_on_caption()
 
             # log_it('last line = {}'.format(self._start_pos + self._maxY))
             if a_sel < self._start_pos or a_sel >= self._start_pos + self._body_maxY:
                 self._start_pos = self._selection - int(self._body_maxY / 2) + 1
-                self.show()
+                self._refresh()
             else:
                 self._toggle_selected_item()
 
@@ -1940,29 +1941,39 @@ def show(self, parent=None):
                 the window to print output
         '''
         # log_it('show')
+        new_win = False
         if (not self._showed or parent != self._parent) \
                 and parent is not None:
             # log_it('\n\nhere\n\n')
             # log_it('got new parent')
             self._parent = parent
             self._get_window()
-            self._win.bkgdset(' ', self._color_border)
-            self._win.erase()
-            self._win.box()
             # logger.error('too_small = {}'.format(self._too_small))
-            if not self._too_small:
-                self._win.addstr(
-                    0, int((self._maxX-len(self._title))/2),
-                    self._title, self._color_title
-                )
             self._calculate_max_height_max_width()
+            new_win = True
 
         if self._too_small:
             self._win.addstr(1, 1, ' Window is', self._color)
             self._win.addstr(2, 1, ' Too small', self._color)
             self._win.refresh()
             return
 
+        if new_win:
+            self._verify_selection_not_on_caption()
+            self._make_sure_selection_is_visible()
+            self.show()
+            return
+
+        self._win.bkgdset(' ', self._color_border)
+        self._win.erase()
+        self._win.box()
+        self._win.addstr(
+            0, int((self._maxX-len(self._title))/2),
+            self._title, self._color_title
+        )
+        self._refresh()
+
+    def _refresh(self):
         if len(self._items) == 0:
             self._win.hline(self._Y, self._X, ' ', self._maxX, self._color)
             self._win.refresh()
@@ -2111,7 +2122,7 @@ def delete_item(self, target):
 
         self._verify_selection_not_on_caption(mov)
         if not self._make_sure_selection_is_visible():
-            self.show()
+            self._refresh()
 
         return len(self._items)
 
@@ -2190,28 +2201,6 @@ def keypress(self, char):
         if self._too_small:
             return 1
 
-        if char == ord('z'):
-            self.selection = 10
-            return 1
-
-        if char == ord('d'):
-            self.selection = 50
-            return 1
-
-        if char == ord('c'):
-            self.selection = 100
-            return 1
-
-        if char == ord('e'):
-            self.selection = 15
-            return 1
-
-        if char == ord('w'):
-            self.selection = 1122
-            return 1
-
-
-
         if (not self._focused) or (not self._enabled):
             return 1
 
@@ -2239,7 +2228,7 @@ def keypress(self, char):
                 if len(self._items) == len(self._captions) + 1:
                     return 0
             self.delete_item(self._selection)
-            self.show()
+            self._refresh()
             return 0
 
         elif self._right_arrow_selects and char in (
@@ -2270,7 +2259,7 @@ def keypress(self, char):
                 self._toggle_selected_item()
             else:
                 self._start_pos = 0
-                self.show()
+                self._refresh()
 
         elif char in (ord('G'), curses.KEY_END):
             if len(self._items) == 0:
@@ -2284,10 +2273,10 @@ def keypress(self, char):
                     self._toggle_selected_item()
                 else:
                     self._start_pos = self._selection - self._body_maxY + 1
-                    self.show()
+                    self._refresh()
             else:
                 self._start_pos = 0
-                self.show()
+                self._refresh()
 
         elif char == ord('H'):
             if len(self._items) == 0:
@@ -2318,17 +2307,17 @@ def keypress(self, char):
                 self._verify_selection_not_on_caption()
                 if self._scroll:
                     self._start_pos = self._selection - self._body_maxY + 1
-                    self.show()
+                    self._refresh()
                     return 1
             else:
                 self._selection -= 5
                 self._verify_selection_not_on_caption()
                 if self._selection < self._start_pos:
                     self._start_pos = self._selection
-                    self.show()
+                    self._refresh()
                     return 1
             if not self._toggle_selected_item():
-                self.show()
+                self._refresh()
 
         elif char in (curses.KEY_NPAGE, ):
             if len(self._items) == 0:
@@ -2338,7 +2327,7 @@ def keypress(self, char):
                 self._verify_selection_not_on_caption()
                 self._start_pos = 0
                 if self._scroll:
-                    self.show()
+                    self._refresh()
                     return 1
             else:
                 self._selection += 5
@@ -2350,10 +2339,10 @@ def keypress(self, char):
                     # log_it('sel = {1}, start = {1}'.format(self._selection, self._start_pos))
                     if self._selection - self._start_pos > self._body_maxY - 1:
                         self._start_pos = self._selection - self._body_maxY + 1
-                        self.show()
+                        self._refresh()
                         return 1
             if not self._toggle_selected_item():
-                self.show()
+                self._refresh()
 
         elif char in (ord('k'), curses.KEY_UP):
             if len(self._items) == 0:
@@ -2366,20 +2355,20 @@ def keypress(self, char):
                 self._start_pos = 0
                 if self._scroll:
                     self._start_pos = self._selection - self._body_maxY + 1
-                    self.show()
+                    self._refresh()
                     return 1
             if self._scroll:
                 # we have scrolling items
                 if self._selection < self._start_pos:
                     # we need to scroll!
                     self._start_pos -= 1
                     # log_it('We need to scroll: start: {0}, selection = {1}'.format(self._start_pos,self._selection))
-                    self.show()
+                    self._refresh()
                     return 1
             # log_it('going from {0} to {1}, start at {2}'.format(self._old_selection, self._selection, self._start_pos))
             if not self._toggle_selected_item():
-                # log_it('self.show')
-                self.show()
+                # log_it('self._refresh')
+                self._refresh()
 
         elif char in (ord('j'), curses.KEY_DOWN):
             if len(self._items) == 0:
@@ -2393,19 +2382,19 @@ def keypress(self, char):
                 self._verify_selection_not_on_caption()
                 self._start_pos = 0
                 if self._scroll:
-                    self.show()
+                    self._refresh()
                     return 1
             if self._scroll:
                 # we have scrolling items
                 if self._selection >= self._start_pos + self._body_maxY:
                     # we need to scroll!
                     self._start_pos = self._selection - self._body_maxY + 1
                     # log_it('We need to scroll: start: {0}, selection {1}'.format(self._start_pos, self._selection))
-                    self.show()
+                    self._refresh()
                     return 1
 
             if not self._toggle_selected_item():
-                self.show()
+                self._refresh()
 
         elif char in self._local_functions.keys():
             self._local_functions(char)
@@ -2415,6 +2404,7 @@ def keypress(self, char):
 
         return 1
 
+
 class SimpleCursesCheckBox(SimpleCursesWidget):
     '''A very simple checkbox curses widget '''
     _checked = False

pyradio/window_stack.py

@@ -96,6 +96,7 @@ class Window_Stack_Constants(object):
     ASK_TO_UPDATE_STATIONS_CSV_MODE = 135
     UPDATE_STATIONS_CSV_RESULT_MODE = 136
     GROUP_SELECTION_MODE = 137
+    GROUP_SEARCH_MODE = 138
     # TODO: return values from opening theme
     PLAYLIST_RECOVERY_ERROR_MODE = 200
     PLAYLIST_NOT_FOUND_ERROR_MODE = 201
@@ -276,6 +277,7 @@ class Window_Stack_Constants(object):
         UPDATE_NOTIFICATION_MODE: 'UPDATE_NOTIFICATION_MODE',
         UPDATE_STATIONS_CSV_RESULT_MODE: 'UPDATE_STATIONS_CSV_RESULT_MODE',
         GROUP_SELECTION_MODE: 'GROUP_SELECTION_MODE',
+        GROUP_SEARCH_MODE: 'GROUP_SEARCH_MODE'
     }
 
     ''' When PASSIVE_WINDOWS target is one of them,