- build_install_pyradio: install / uninstall pyradio_buf man page

- fixing default station selection in Config Window
- started working on Config Window search function
- fixing colors for search window in Config Window

Author: s-n-g

devel/build_install_pyradio

@@ -135,6 +135,7 @@ function uninstall_sudo(){
     echo -n '  ** Removing help files ... '
     sudo rm -f /usr/share/man/man1/pyradio.1.gz 2>/dev/null || sudo rm -f /usr/local/share/man/man1/pyradio.1.gz 2>/dev/null
     sudo rm -f /usr/share/man/man1/pyradio_rb.1.gz 2>/dev/null || sudo rm -f /usr/local/share/man/man1/pyradio_rb.1.gz 2>/dev/null
+    sudo rm -f /usr/share/man/man1/pyradio_buf.1.gz 2>/dev/null || sudo rm -f /usr/local/share/man/man1/pyradio_buf.1.gz 2>/dev/null
     sudo rm -f /usr/share/man/man1/pyradio_server.1.gz 2>/dev/null || sudo rm -f /usr/local/share/man/man1/pyradio_server.1.gz 2>/dev/null
     sudo rm -f /usr/share/man/man1/pyradio-client.1.gz 2>/dev/null || sudo rm -f /usr/local/share/man/man1/pyradio-client.1.gz 2>/dev/null
     echo done
@@ -485,6 +486,7 @@ then
     cd docs
     gzip -k pyradio.1
     gzip -k pyradio_rb.1
+    gzip -k pyradio_buf.1
     gzip -k pyradio_rec.1
     gzip -k pyradio_server.1
     gzip -k pyradio-client.1
@@ -494,6 +496,7 @@ then
     mv -f pyradio_server.1.gz ~/.local/share/man/man1 2>/dev/null || mv -f pyradio_server.1.gz ~/.local/local/share/man/man1
     mv -f pyradio-client.1.gz ~/.local/share/man/man1 2>/dev/null || mv -f pyradio-client.1.gz ~/.local/local/share/man/man1
     mv -f pyradio_rec.1.gz ~/.local/share/man/man1 2>/dev/null || mv -f pyradio_rec.1.gz ~/.local/local/share/man/man1
+    mv -f pyradio_buf.1.gz ~/.local/share/man/man1 2>/dev/null || mv -f pyradio_buf.1.gz ~/.local/local/share/man/man1
     DOC=~/.local/share/doc/pyradio
     mkdir -p "$DOC" 2>/dev/null
     if [ ! -d "$DOC" ]

pyradio/config_window.py

@@ -3417,13 +3417,8 @@ def _read_items(self, a_station=None):
                     for row in csv.reader(filter(lambda row: row[0] != '#', cfgfile), skipinitialspace=True):
                         if not row:
                             continue
-                        try:
-                            name, url = [s.strip() for s in row]
-                        except ValueError:
-                            try:
-                                name, url, _ = [s.strip() for s in row]
-                            except ValueError:
-                                name, url, _, _ = [s.strip() for s in row]
+                        name = row[0].strip()
+                        url =  row[1].strip()
                         self._items.append(name)
                         if url == '-':
                             self._groups_ids.append(name)

pyradio/radio.py

@@ -629,6 +629,7 @@ def __init__(self, pyradio_config,
             self.ws.SCHEDULE_STATION_SEARCH_MODE: self._redisplay_search_show,
             self.ws.SCHEDULE_PLAYLIST_SEARCH_MODE: self._redisplay_search_show,
             self.ws.GROUP_SEARCH_MODE: self._redisplay_search_show,
+            self.ws.CONFIG_SEARCH_MODE: self._redisplay_search_show,
             self.ws.THEME_MODE: self._redisplay_theme_mode,
             self.ws.ASK_TO_CREATE_NEW_THEME_MODE: self._redisplay_ask_to_create_new_theme,
             self.ws.ADD_STATION_MODE: self._show_station_editor,
@@ -689,6 +690,7 @@ def __init__(self, pyradio_config,
             self.ws.BROWSER_SEARCH_MODE: 'H_RB_SEARCH',
             self.ws.SEARCH_NORMAL_MODE: 'H_SEARCH',
             self.ws.SEARCH_PLAYLIST_MODE: 'H_SEARCH',
+            self.ws.CONFIG_SEARCH_MODE: 'H_SEARCH',
             self.ws.SELECT_STATION_ENCODING_MODE: 'H_CONFIG_ENCODING',
             self.ws.SELECT_ENCODING_MODE: 'H_CONFIG_ENCODING',
             self.ws.EDIT_STATION_ENCODING_MODE: 'H_CONFIG_ENCODING',
@@ -702,8 +704,9 @@ def __init__(self, pyradio_config,
             2 - theme search
             3 - paste mode
             4 - group selection
+            5 - config search
         '''
-        self._search_classes = [None, None, None, None, None]
+        self._search_classes = [None, None, None, None, None, None]
 
         ''' the files that the search terms are stored to  '''
         self._search_files = (
@@ -712,6 +715,7 @@ def __init__(self, pyradio_config,
                 path.join(self._cnf.state_dir, 'search-theme.txt'),
                 path.join(self._cnf.state_dir, 'search-paste.txt'),
                 path.join(self._cnf.state_dir, 'search-group.txt'),
+                path.join(self._cnf.state_dir, 'search-config.txt'),
                 )
 
         ''' points to list in which the search will be performed '''
@@ -728,6 +732,7 @@ def __init__(self, pyradio_config,
             self.ws.THEME_MODE: 2,
             self.ws.PASTE_MODE: 3,
             self.ws.GROUP_SELECTION_MODE: 4,
+            self.ws.CONFIG_MODE: 5,
         }
 
         ''' which search mode opens from each allowed mode '''
@@ -741,12 +746,14 @@ def __init__(self, pyradio_config,
             self.ws.GROUP_SELECTION_MODE: self.ws.GROUP_SEARCH_MODE,
             self.ws.SCHEDULE_PLAYLIST_SELECT_MODE: self.ws.SCHEDULE_PLAYLIST_SEARCH_MODE,
             self.ws.SCHEDULE_STATION_SELECT_MODE: self.ws.SCHEDULE_STATION_SEARCH_MODE,
+            self.ws.CONFIG_MODE: self.ws.CONFIG_SEARCH_MODE,
         }
 
         ''' search modes opened from main windows '''
         self.search_main_window_modes = (
             self.ws.SEARCH_NORMAL_MODE,
             self.ws.SEARCH_PLAYLIST_MODE,
+            self.ws.CONFIG_SEARCH_MODE
         )
 
         ''' volume functions '''
@@ -2333,8 +2340,7 @@ def _give_me_a_search_class(self, operation_mode):
         '''
         try:
             if self._search_classes[self._mode_to_search[operation_mode]] is None:
-                self._search_classes[self._mode_to_search[operation_mode]] \
-                    = \
+                self._search_classes[self._mode_to_search[operation_mode]] = \
                     PyRadioSearch(
                         parent=self.outerBodyWin,
                         width=33,
@@ -2355,10 +2361,11 @@ def _give_me_a_search_class(self, operation_mode):
             return
         self.search = self._search_classes[self._mode_to_search[operation_mode]]
         #self.search.pure_ascii = True
-        if self.ws.previous_operation_mode == self.ws.CONFIG_MODE:
+        if self.ws.operation_mode == self.ws.CONFIG_MODE or \
+                self.ws.previous_operation_mode == self.ws.CONFIG_MODE:
             self.search.box_color = curses.color_pair(3)
-        else:
-            self.search.box_color = curses.color_pair(5)
+            self.search.caption_color=curses.color_pair(11)
+            self.search.edit_color=curses.color_pair(10)
 
     def ctrl_c_handler(self, signum, frame, save_playlist=True):
         # ok
@@ -6797,6 +6804,7 @@ def keypress(self, char):
                 win_del_old_inst()
             return
 
+        logger.error('self.ws.operation_mode in self._search_modes = {}'.format(self.ws.operation_mode in self._search_modes))
         if self.ws.operation_mode in (
             self.ws.DEPENDENCY_ERROR,
             self.ws.NO_PLAYER_ERROR_MODE,
@@ -7526,7 +7534,9 @@ def keypress(self, char):
             self.refreshBody()
 
         elif self.ws.operation_mode == self.ws.CONFIG_MODE and \
-                char not in self._chars_to_bypass:
+                char not in self._chars_to_bypass and \
+                char not in self._chars_to_bypass_for_search:
+
             if char in (kbkey['revert_saved'], kbkey['revert_def']) or \
                     check_localized(char, (kbkey['revert_saved'], kbkey['revert_def'])):
                 self._player_select_win = None

pyradio/window_stack.py

@@ -31,6 +31,7 @@ class Window_Stack_Constants():
     EDIT_THEME_MODE = 15
     EDIT_STATION_ENCODING_MODE = 16
     IN_PLAYER_PARAMS_EDITOR = 17
+    CONFIG_SEARCH_MODE = 18
     REMOVE_STATION_MODE = 50
     SAVE_PLAYLIST_MODE = 51
     ASK_TO_SAVE_PLAYLIST_WHEN_OPENING_PLAYLIST_MODE = 52
@@ -113,6 +114,7 @@ class Window_Stack_Constants():
         PLAYLIST_MODE: 'PLAYLIST_MODE',
         SEARCH_NORMAL_MODE: 'SEARCH_NORMAL_MODE',
         SEARCH_PLAYLIST_MODE: 'SEARCH_PLAYLIST_MODE',
+        CONFIG_SEARCH_MODE: 'CONFIG_SEARCH_MODE',
         SEARCH_THEME_MODE: 'SEARCH_THEME_MODE',
         SEARCH_SELECT_PLAYLIST_MODE: 'SEARCH_SELECT_PLAYLIST_MODE',
         SEARCH_SELECT_STATION_MODE: 'SEARCH_SELECT_STATION_MODE',