- adding play next/previous station to global functions

- fixing Connection Type window colors
- fixing line editor blobal function handler

Author: s-n-g

pyradio/browser.py

@@ -3062,23 +3062,23 @@ def keypress(self, char):
         ):
             return -1
 
+        class_name = type(self._widgets[self._focus]).__name__
+
         if char == ord('q') and \
-                type(self._widgets[self._focus]).__name__ != 'SimpleCursesLineEdit':
+                class_name != 'SimpleCursesLineEdit':
             return -1
 
         if self._too_small:
             self._backslash_pressed = False
             return 1
 
-        class_name = type(self._widgets[self._focus]).__name__
-
         if char == ord('0') and \
-                type(self._widgets[self._focus]).__name__ != 'SimpleCursesLineEdit':
+                class_name != 'SimpleCursesLineEdit':
             self._goto_first_history_item()
             self._backslash_pressed = False
 
         elif char == ord('$') and \
-                type(self._widgets[self._focus]).__name__ != 'SimpleCursesLineEdit':
+                class_name != 'SimpleCursesLineEdit':
             self._goto_last_history_item()
             self._backslash_pressed = False
 

pyradio/config.py

@@ -2504,7 +2504,7 @@ def __init__(
         ]
         self.item = 0
         self.play_from_history = True
-        #self.clear()
+        self.clear()
         ######## DEBUG END
 
         self.execute_func = execute_function

pyradio/edit.py

@@ -623,6 +623,7 @@ def keypress(self, char):
                     0: exit edit mode, string isvalid
                    -1: cancel
                 """
+                logger.error('>> line editort key press')
                 ret = self._line_editor[self._focus].keypress(self._win, char)
                 if ret == 1:
                     # get next char
@@ -638,6 +639,7 @@ def keypress(self, char):
                     self._reset_editors_modes()
                     ret = -1
             elif char in self._global_functions.keys():
+                logger.error('>> global functions')
                 self._global_functions[char]()
 
         if self._focus > 1:
@@ -1201,7 +1203,7 @@ def show(self, parent=None):
             self._win.bkgdset(' ', curses.color_pair(3))
             self._win.erase()
             self._win.box()
-            self._win.addstr(1, 2, 'Window too small', curses.color_pair(5))
+            self._win.addstr(1, 2, 'Window too small', curses.color_pair(10))
         else:
 
             self._win = curses.newwin(self._max_lines, self.MaxX, new_y, new_x)
@@ -1211,11 +1213,11 @@ def show(self, parent=None):
 
             # show title
             x = int((self.MaxX - len(self._title)) / 2)
-            self._win.addstr(0, x, self._title, curses.color_pair(4))
+            self._win.addstr(0, x, self._title, curses.color_pair(11))
 
             # show content
-            self._win.addstr(2, 4, self._text, curses.color_pair(5))
-            self._win.addstr('{}'.format(self.connection_type), curses.color_pair(4))
+            self._win.addstr(2, 4, self._text, curses.color_pair(10))
+            self._win.addstr('{}'.format(self.connection_type), curses.color_pair(11))
 
             # show help
             try:
@@ -1226,13 +1228,13 @@ def show(self, parent=None):
 
 
 
-            self._win.addstr(5, 2, 'j k l SPACE', curses.color_pair(4))
-            self._win.addstr(6, 2, 'RIGHT UP DOWN', curses.color_pair(4))
-            self._win.addstr('    Toggle parameter', curses.color_pair(5))
-            self._win.addstr(7, 2, 'ENTER s', curses.color_pair(4))
-            self._win.addstr('          Accept parameter', curses.color_pair(5))
-            self._win.addstr(8, 2, 'Esc q h RIGHT', curses.color_pair(4))
-            self._win.addstr('    Cancel operation', curses.color_pair(5))
+            self._win.addstr(5, 2, 'j k l SPACE', curses.color_pair(11))
+            self._win.addstr(6, 2, 'RIGHT UP DOWN', curses.color_pair(11))
+            self._win.addstr('    Toggle parameter', curses.color_pair(10))
+            self._win.addstr(7, 2, 'ENTER s', curses.color_pair(11))
+            self._win.addstr('          Accept parameter', curses.color_pair(10))
+            self._win.addstr(8, 2, 'Esc q h RIGHT', curses.color_pair(11))
+            self._win.addstr('    Cancel operation', curses.color_pair(10))
 
             # show note
             try:
@@ -1241,8 +1243,8 @@ def show(self, parent=None):
                 self._win.addstr(10, 2, '─'.encode('utf-8') * (self.maxX - 6), curses.color_pair(3))
             self._win.addstr(10, int((self.MaxX - len(self._note_text))/2), self._note_text, curses.color_pair(3))
 
-            self._win.addstr(11, 4, 'Changes made here will not be', curses.color_pair(5))
-            self._win.addstr(12, 3, 'saved in the configuration file', curses.color_pair(5))
+            self._win.addstr(11, 4, 'Changes made here will not be', curses.color_pair(10))
+            self._win.addstr(12, 3, 'saved in the configuration file', curses.color_pair(10))
 
         self._win.refresh()
 

pyradio/player.py

@@ -624,6 +624,7 @@ def updateStatus(self, *args):
                             self.connection_timeout_thread.join()
                         except:
                             pass
+                        self.connecting = False
                         if enable_crash_detection_function:
                             enable_crash_detection_function()
                         if (not self.playback_is_on) and (logger.isEnabledFor(logging.INFO)):

pyradio/radio.py

@@ -518,6 +518,10 @@ def __init__(self, pyradio_config,
             ord('~'): self._toggle_claculated_colors,
             ord('<'): self._stations_history_previous,
             ord('>'): self._stations_history_next,
+            curses.ascii.DLE: self._play_previous_station,
+            curses.KEY_PREVIOUS: self._play_previous_station,
+            curses.ascii.SO: self._play_next_station,
+            curses.KEY_NEXT: self._play_next_station,
         }
 
 
@@ -875,6 +879,9 @@ def _get_redisplay_index():
     def refreshBody(self, start=0):
         if self.player.ctrl_c_pressed:
             return
+        if self._limited_height_mode or self._limited_width_mode:
+            self._print_limited_info()
+            return
         self._update_redisplay_list()
         end = len(self._redisplay_list)
         if end == 0:
@@ -1709,6 +1716,7 @@ def stopPlayer(self,
             #self.selections[0][2] = -1
             if reset_playing:
                 self.playing = -1
+            self.player.process = None
             if show_message:
                 self._show_player_is_stopped(from_update_thread)
 
@@ -3726,7 +3734,10 @@ def _align_stations_and_refresh(self,
         else:
             self.selections[self.ws.NORMAL_MODE] = [self.selection, self.startPos, self.playing, self._cnf.stations]
         # self.ll('_align_stations_and_refresh')
-        self.refreshBody()
+        if self.ws.operation_mode == self.ws.NORMAL_MODE:
+            self.refreshBody()
+        else:
+            logger.error('\n\n2 not refreshing\n\n')
 
     def _show_connect_to_server_message(self):
         ''' display a passive message telling the user
@@ -3814,6 +3825,7 @@ def _open_playlist(self, a_url=None):
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('Opening a playlist or a register...')
             ''' open a register '''
+            self.ws.window_mode = self.ws.PLAYLIST_MODE
             self._playlist_in_editor = self._cnf.register_to_open
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('opening register: ' + self._cnf.register_to_open)
@@ -5104,16 +5116,32 @@ def _move_cursor_one_down(self):
             self._handle_cursor_move_down()
 
     def _play_next_station(self):
-        self.selection = self.playing
-        self._move_cursor_one_down()
-        self.playSelection()
-        self.refreshBody()
+        self._reset_status_bar_right()
+        if self.ws.window_mode == self.ws.PLAYLIST_MODE:
+            self._show_stations_history_notification(2)
+        elif not self.player.isPlaying():
+            self._show_stations_history_notification(3)
+        elif self.player.connecting:
+            self._show_stations_history_notification(1)
+        else:
+            self.selection = self.playing
+            self._move_cursor_one_down()
+            self.playSelection()
+            self.refreshBody()
 
     def _play_previous_station(self):
-        self.selection = self.playing
-        self._move_cursor_one_up()
-        self.playSelection()
-        self.refreshBody()
+        self._reset_status_bar_right()
+        if self.ws.window_mode == self.ws.PLAYLIST_MODE:
+            self._show_stations_history_notification(2)
+        elif not self.player.isPlaying():
+            self._show_stations_history_notification(3)
+        elif self.player.connecting:
+            self._show_stations_history_notification(1)
+        else:
+            self.selection = self.playing
+            self._move_cursor_one_up()
+            self.playSelection()
+            self.refreshBody()
 
     def _ask_to_save_browser_config_to_exit(self):
         if self._cnf.online_browser:
@@ -5216,7 +5244,9 @@ def _show_stations_history_notification(self, msg_id):
         if self._limited_height_mode or self._limited_width_mode:
             msg = (
                 'Operation not supported',
-                'Please wait for the player to settle...'
+                'Please wait for the player to settle...',
+                'Operation supported in stations mode only...'
+                'Player not playing...'
             )
             if self.player.isPlaying():
                 self.log.write(msg=msg[msg_id])
@@ -5226,7 +5256,9 @@ def _show_stations_history_notification(self, msg_id):
         else:
             msg = (
                 '___Operation not suported!!!___\n____Connection timeout is 0 ',
-                '___Please wait for the player___\n__________to settle'
+                '___Please wait for the player___\n__________to settle',
+                '___Operation supported in___\n_____station mode only___',
+                '___Player not playing...___'
             )
             self._show_notification_with_delay(
                 txt=msg[msg_id],
@@ -5235,20 +5267,24 @@ def _show_stations_history_notification(self, msg_id):
             )
 
     def _stations_history_previous(self):
-            self._update_status_bar_right(status_suffix='')
-            if int(self._cnf.connection_timeout_int) == 0:
-                self._show_stations_history_notification(0)
+        self._update_status_bar_right(status_suffix='')
+        if int(self._cnf.connection_timeout_int) == 0:
+            self._show_stations_history_notification(0)
+        elif self.ws.window_mode == self.ws.PLAYLIST_MODE:
+            self._show_stations_history_notification(2)
+        else:
+            if self.player.connecting:
+                self._show_stations_history_notification(1)
             else:
-                if self.player.connecting:
-                    self._show_stations_history_notification(1)
-                else:
-                    self._cnf.play_from_history = True
-                    self._cnf.stations_history.play_previous()
+                self._cnf.play_from_history = True
+                self._cnf.stations_history.play_previous()
 
     def _stations_history_next(self):
         self._update_status_bar_right(status_suffix='')
         if int(self._cnf.connection_timeout_int) == 0:
             self._show_stations_history_notification(0)
+        elif self.ws.window_mode == self.ws.PLAYLIST_MODE:
+            self._show_stations_history_notification(2)
         else:
             if self.player.connecting:
                 self._show_stations_history_notification(1)
@@ -6211,9 +6247,6 @@ def keypress(self, char):
                 ''' browser config save canceled '''
                 self._exit_browser_config()
 
-        # elif self.ws.operation_mode == self.ws.BROWSER_SEARCH_MODE and \
-        #         (char not in self._chars_to_bypass_on_editor or \
-        #         self._cnf._online_browser.line_editor_has_focus()):
         elif self.ws.operation_mode == self.ws.BROWSER_SEARCH_MODE:
 
             if char in self._global_functions.keys() and \
@@ -7233,16 +7266,6 @@ def keypress(self, char):
                     ''' uninstall on Windows '''
                     self._show_win_remove_old_installation()
 
-                elif self.player.isPlaying() and char in (curses.ascii.SO, curses.KEY_NEXT):
-                    self._reset_status_bar_right()
-                    self._play_next_station()
-                    return
-
-                elif self.player.isPlaying() and char in (curses.ascii.DLE, curses.KEY_PREVIOUS):
-                    self._reset_status_bar_right()
-                    self._play_previous_station()
-                    return
-
                 elif char in (ord('a'), ord('A')):
                     self._reset_status_bar_right()
                     if self._cnf.browsing_station_service: return
@@ -8606,13 +8629,20 @@ def _load_playlist_and_station_from_station_history(self, h_item, func):
                 logger.error('==== update outer Body!')
                 self.outerBodyWin.box()
                 self._print_body_header()
-                self.outerBodyWin.refresh()
+                # self.outerBodyWin.refresh()
             self.playSelection()
             self._set_active_stations()
             self._get_playlists_data_from_playlist_name(h_item[0])
             self.saved_active_stations = [['', 0], ['', -1]]
-            if self._limited_height_mode or self._limited_width_mode:
-                self._print_limited_info()
+            # if self._limited_height_mode or self._limited_width_mode:
+            #     self._print_limited_info()
+            # else:
+            #     #if self.ws.operation_mode == self.ws.NORMAL_MODE:
+            #     #    self.refreshBody()
+            #     #else:
+            #     #    logger.error('\n\n1 not refreshing\n\n')
+            #     self.refreshBody()
+            self.refreshBody()
             return
 
         try:

pyradio/simple_curses_widgets.py

@@ -2573,6 +2573,17 @@ def keypress(self, win, char):
         if self.log is not None:
             self.log('char = {}\n'.format(char))
 
+        if char in self._global_functions.keys() and \
+                self._backslash_pressed:
+            ''' toggle paste mode '''
+            self._backslash_pressed = False
+            if not self._paste_mode_always_on:
+                self._paste_mode = False
+                if self._mode_changed:
+                    self._mode_changed()
+            self._global_functions[char]()
+            return 1
+
         if platform.startswith('win'):
             if char == 420:
                 ''' A-D, clear to end of line '''
@@ -2901,16 +2912,6 @@ def keypress(self, win, char):
             if self._mode_changed:
                 self._mode_changed()
 
-        elif chr(char) in self._global_functions.keys() and \
-                self._backslash_pressed:
-            ''' toggle paste mode '''
-            self._backslash_pressed = False
-            if not self._paste_mode_always_on:
-                self._paste_mode = False
-                if self._mode_changed:
-                    self._mode_changed()
-            self._global_functions[char]()
-
         else:
             self._backslash_pressed = False
             if logger.isEnabledFor(logging.DEBUG):