- fixing build license warning

- fixing Sorting Error #286
- started working on not stopping playback when
  changing playlist and station not found

Author: s-n-g

pyproject.toml

@@ -7,11 +7,11 @@ authors = [
 ]
 description = "Command line internet radio player"
 readme = "README.md"
-license = {file = "LICENSE"}
+license = "MIT"
+license-files = ["LICENSE"]
 requires-python = ">=3.7"
 classifiers = [
     "Programming Language :: Python :: 3",
-    "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
 

pyradio/browser.py

@@ -4068,7 +4068,7 @@ def keypress(self, char):
         elif char in (
             kbkey['l'], kbkey['pause'], curses.KEY_RIGHT,
             ord('\n'), ord('\r'), curses.KEY_ENTER
-        ) or check_localized(char, (kbkey['paluse'], kbkey['l'])):
+        ) or check_localized(char, (kbkey['pause'], kbkey['l'])):
             for i, n in enumerate(self.items.keys()):
                 if i == self.selection:
                     self.search_by = self.items[n]

pyradio/messages_system.py

@@ -265,6 +265,15 @@ def set_text(self, parent, *args):
 Please play a station to get its info, (or
 wait until one actually starts playing).
 
+'''
+),
+
+    'M_STATION_INFO_CHANGED': ('Station Info Error',
+r'''
+Station info not available at this time,
+since the station playing is not in the
+current playlist.
+
 '''
 ),
 

pyradio/radio.py

@@ -313,6 +313,7 @@ class PyRadio():
     search = None
 
     _last_played_station = []
+    _last_played_playlist = ''
 
     _random_requested = False
 
@@ -641,6 +642,7 @@ def __init__(self, pyradio_config,
             self.ws.CLEAR_REGISTER_MODE: self._print_clear_register,
             self.ws.CLEAR_ALL_REGISTERS_MODE: self._print_clear_all_registers,
             self.ws.STATION_INFO_ERROR_MODE: self._print_station_info_error,
+            self.ws.STATION_INFO_CHANGED_MODE: self._print_station_info_change,
             self.ws.STATION_INFO_MODE: self._show_station_info,
             self.ws.STATION_DATABASE_INFO_MODE: self._browser_station_info,
             self.ws.RENAME_PLAYLIST_MODE: self._show_rename_dialog,
@@ -2623,6 +2625,8 @@ def playSelection(self, restart=False):
             #         stream_url = self._cnf.online_browser.url(self.selection)
             self._last_played_station = self.stations[self.selection]
             self._last_played_station_id = self.selection
+            self._last_played_playlist = self._cnf.station_title
+            logger.error('\n\nself._last_played_playlist = {}\n\n'.format(self._last_played_playlist))
             with self._check_lock:
                 self._station_to_check_id = self.selection
                 if logger.isEnabledFor(logging.INFO):
@@ -2713,6 +2717,7 @@ def connectionFailed(self):
         self.detect_if_player_exited = False
         if self.ws.operation_mode in (self.ws.STATION_INFO_MODE,
                 self.ws.STATION_DATABASE_INFO_MODE,
+                self.ws.STATION_INFO_CHANGED_MODE,
                 self.ws.STATION_INFO_ERROR_MODE):
             self.ws.close_window()
         old_playing = self.playing
@@ -3627,6 +3632,12 @@ def _print_register_save_error(self):
                 string_to_display
                 )
 
+    def _print_station_info_change(self):
+        self._open_simple_message_by_key_and_mode(
+                self.ws.STATION_INFO_CHANGED_MODE,
+                'M_STATION_INFO_CHANGED'
+                )
+
     def _print_station_info_error(self):
         self._open_simple_message_by_key_and_mode(
                 self.ws.STATION_INFO_ERROR_MODE,
@@ -3945,6 +3956,8 @@ def _align_stations_and_refresh(self,
                 self.selection, self.playing = self._get_stations_ids((
                     self.active_stations[0][0],
                     self.active_stations[1][0]))
+                # TODO: continue playing after changing playlist
+                # if self.player.isPlaying():
                 if self.playing == -1:
                     self.stopPlayer()
 
@@ -3953,6 +3966,7 @@ def _align_stations_and_refresh(self,
                     if logger.isEnabledFor(logging.DEBUG):
                         logger.debug('Setting playing station at {}'.format(self.playing))
                     self.setStation(self.playing)
+                    self._last_played_playlist = self._cnf.station_title
                 else:
                     if self.selection == -1:
                         if a_selection > -1:
@@ -4807,9 +4821,13 @@ def _show_config_window(self):
 
     def _show_station_info_from_thread(self):
         if self.ws.operation_mode in (
-                self.ws.STATION_INFO_MODE,
+            self.ws.STATION_INFO_MODE,
+                self.ws.STATION_INFO_CHANGED_MODE,
                 self.ws.STATION_INFO_ERROR_MODE):
-            if self.ws.operation_mode == self.ws.STATION_INFO_ERROR_MODE:
+            if self.ws.operation_mode in (
+                self.ws.STATION_INFO_CHANGED_MODE,
+                self.ws.STATION_INFO_ERROR_MODE
+            ):
                 self.ws.close_window()
             # logger.error('\n\nself._show_station_info() from thread\n\n')
             self.ws.close_window()
@@ -5607,7 +5625,10 @@ def _handle_passive_windows(self):
 
     def _normal_station_info(self):
         if self.player.isPlaying():
-            self._show_station_info()
+            if self._last_played_playlist == self._cnf.station_title:
+                self._show_station_info()
+            else:
+                self._print_station_info_change()
         else:
             self._print_station_info_error()
 
@@ -8023,6 +8044,9 @@ def keypress(self, char):
                         self.selections[0][3] = self.stations
                         if self.selection == self.playing:
                             self._last_played_station = self.stations[self.selection]
+                            # I do not need to set it here, i'm just changing the station's encoding
+                            # self._last_played_playlist = self._cnf.station_title
+                            # logger.error('\n\nself._last_played_playlist = {}\n\n'.format(self._last_played_playlist))
                         if self._cnf.browsing_station_service:
                             self._cnf.dirty_playlist = False
                             self._cnf.online_browser.set_encoding(self.selection, ret_encoding)
@@ -8082,6 +8106,9 @@ def keypress(self, char):
                     self._cnf.renamed_stations[-1][-1] = self.stations[self.selection][0]
                     if self.selection == self.playing:
                         self._last_played_station = self._station_editor.new_station
+                        # I do not need to set it here, i'm just editing a station
+                        # self._last_played_playlist = self._cnf.station_title
+                        # logger.error('\n\nself._last_played_playlist = {}\n\n'.format(self._last_played_playlist))
                 else:
                     ''' adding a new station '''
                     self._cnf.dirty_playlist = True
@@ -9334,6 +9361,9 @@ def keypress(self, char):
                 self.stations[self.playing][0] = icy_data_name
                 self._cnf.dirty_playlist = True
                 self._last_played_station = self.stations[self.playing]
+                # I do not need to set it here, i'm just renaming the station
+                # self._last_played_playlist = self._cnf.station_title
+                # logger.error('\n\nself._last_played_playlist = {}\n\n'.format(self._last_played_playlist))
                 self.selections[0][3] = self.stations
                 self._show_station_info()
             else:

pyradio/window_stack.py

@@ -100,6 +100,7 @@ class Window_Stack_Constants():
     FOREIGN_PLAYLIST_ASK_MODE = 300
     CONFIG_SAVE_ERROR_MODE = 303
     STATION_INFO_ERROR_MODE = 308
+    STATION_INFO_CHANGED_MODE = 309
     PLAYLIST_CREATE_ERROR = 311
     WIN_VLC_NO_RECORD_MODE = 324
     KEYBOARD_CONFIG_ERROR_MODE = 325
@@ -156,6 +157,7 @@ class Window_Stack_Constants():
         STATION_INFO_MODE: 'STATION_INFO_MODE',
         STATION_DATABASE_INFO_MODE: 'STATION_DATABASE_INFO_MODE',
         STATION_INFO_ERROR_MODE: 'STATION_INFO_ERROR_MODE',
+        STATION_INFO_CHANGED_MODE: 'STATION_INFO_CHANGED_MODE',
         CREATE_PLAYLIST_MODE: 'CREATE_PLAYLIST_MODE',
         RENAME_PLAYLIST_MODE: 'RENAME_PLAYLIST_MODE',
         PLAYLIST_CREATE_ERROR: 'PLAYLIST_CREATE_ERROR',
@@ -234,6 +236,7 @@ class Window_Stack_Constants():
         PLAYLIST_NOT_FOUND_ERROR_MODE,
         SERVICE_CONNECTION_ERROR,
         STATION_INFO_ERROR_MODE,
+        STATION_INFO_CHANGED_MODE,
         PLAYLIST_CREATE_ERROR,
         UNNAMED_REGISTER_MODE,
         STATION_DATABASE_INFO_MODE,