- adding continous_playback config option

- fixing a CVS read crash when no items in file

Author: s-n-g

pyradio/common.py

@@ -642,6 +642,7 @@ def update_stations_csv(self, print_messages=True):
 class CsvReadWrite():
     ''' A base class to read and write a PyRadio playlist '''
     _items = None
+    _version = Station.url
 
     encoding_to_remove = None
 

pyradio/config

@@ -27,6 +27,17 @@ default_playlist = stations
 # Default value: False
 default_station = False
 
+# Continuous playback
+# When changing playlists while playing a station, PyRadio will check if the
+# station currently playing is in the newly opened playlist. If it is,
+# playback will continue. If it is not there, playback will stop.
+#
+# When this option is set to True, playback will not stop even when the
+# station does not exist in the newly opened playlist.
+#
+# Default value: False
+continous_playback = False
+
 
 # Mouse support
 # If this options is enabled, the mouse can be used to scroll the playlist,

pyradio/config.py

@@ -1296,6 +1296,7 @@ class PyRadioConfig(PyRadioStations):
     opts['default_playlist'] = ['Def. playlist: ', 'stations']
     opts['default_station'] = ['Def. station: ', 'False']
     opts['default_encoding'] = ['Def. encoding: ', 'utf-8']
+    opts['continous_playback'] = ['Continous playback: ', False]
     opts['recording_dir'] = ['Recordings dir: ', '']
     opts['resource_opener'] = ['Resource Opener: ', 'auto']
     opts['log_titles'] = ['Log titles: ', False]
@@ -1467,6 +1468,15 @@ def __init__(self, user_config_dir=None, headless=False):
         self._read_notification_command()
         self.profile_manager = ProfileManager()
 
+    @property
+    def continous_playback(self):
+        return self.opts['continous_playback'][1]
+
+    @continous_playback.setter
+    def continous_playback(self, val):
+        self.opts['continous_playback'][1] = val
+        self.opts['dirty_config'][1] = True
+
     @property
     def mplayer_save_br(self):
         return self.opts['mplayer_save_br'][1]
@@ -2354,6 +2364,11 @@ def _read_config(self, distro_config=False):
                     self.opts['default_station'][1] = None
                 else:
                     self.opts['default_station'][1] = st
+            elif sp[0] == 'continous_playback':
+                if sp[1].lower() == 'false':
+                    self.opts['continous_playback'][1] = False
+                else:
+                    self.opts['continous_playback'][1] = True
             elif sp[0] == 'open_last_playlist':
                 if sp[1].lower() == 'false':
                     self.opts['open_last_playlist'][1] = False

pyradio/config_window.py

@@ -70,6 +70,7 @@ class PyRadioConfigWindow():
     _help_text.append(['This is the encoding used by default when reading data provided by a station such as song title, etc. If reading said data ends up in an error, "utf-8" will be used instead.', '|',
     'If changed, playback must be restarted so that changes take effect.',
     '|', 'Default value: utf-8'])
+    _help_text.append(['When changing playlists while playing a station, PyRadio will check if the station currently playing is in the newly opened playlist. If it is, playback will continue. If it is not there, playback will stop.', '|', 'When this option is set to True, playback will not stop even when the station does not exist in the newly opened playlist.', '|', 'Default value: False'])
     _help_text.append([ 'This is the folder where recorded files will be saved', '|', 'Tip: When you open the window "h" will display HTML help about this parameter (not in Line Editor).', '|', 'Default value: "pyradio-recordings" in home dir' ])
     _help_text.append(['This is a Linux (et al) only parameter. It has no effect on Windows or MacOS.', '|',
                        'Default value is "auto", in which case, PyRadio will try to use xdg-open, gio, mimeopen, mimeo or handlr, in that order of detection.  If none if found, the requested file will simply not open.'
@@ -1105,7 +1106,8 @@ def keypress(self, char):
                     sel == 'wheel_adjusts_volume' or \
                     sel == 'log_titles' or \
                     sel == 'remove_station_icons' or \
-                    sel == 'mplayer_save_br':
+                    sel == 'mplayer_save_br' or \
+                    sel == 'continous_playback':
                 self._config_options[sel][1] = not self._config_options[sel][1]
                 # # if sel == 'open_last_playlist':
                 # #     if self._config_options[sel][1]:

pyradio/radio.py

@@ -3900,10 +3900,10 @@ def _align_stations_and_refresh(self,
             ''' The playlist is empty '''
             # ok
             self.detect_if_player_exited = False
-            if self.player.isPlaying():
+            if self.player.isPlaying() and \
+                    not self._cnf.continous_playback:
                 self.stopPlayer()
-            self.playing, self.selection, self.stations, \
-                self.number_of_items = (-1, 0, 0, 0)
+                self.playing, self.selection, self.startPos = (-1, 0, 0)
             self.refreshBody()
             return
         else:
@@ -3969,22 +3969,18 @@ def _align_stations_and_refresh(self,
                 logger.error('DE \n\n{}\n\n'.format(self.active_stations))
                 logger.error('DE \n\n{}\n\n'.format(self._last_played_station))
                 logger.error('DE \n\n{}\n\n'.format(self._last_played_playlist))
-                if self.player.isPlaying():
-                    if self.active_stations[1][0]:
-                        self.selection, self.playing = self._get_stations_ids((
-                            self.active_stations[0][0],
-                            self.active_stations[1][0]))
-                        logger.error('1')
-                    else:
-                        self.selection, self.playing = self._get_stations_ids((
-                            self.active_stations[0][0],
-                            self._last_played_station[0]))
-                        logger.error('2')
-                else:
+                logger.error('\n\nself.playing = {}, self._cnf.continous_playback = {}\n\n'.format(self.playing, self._cnf.continous_playback))
+                self.selection, self.playing = self._get_stations_ids((
+                    self.active_stations[0][0],
+                    self.active_stations[1][0]))
+                if self.playing == -1 and \
+                        not self._cnf.continous_playback:
+                    self.stopPlayer()
+                if self.player.isPlaying() and \
+                        self.active_stations[1][0] == '':
                     self.selection, self.playing = self._get_stations_ids((
                         self.active_stations[0][0],
-                        self.active_stations[1][0]))
-                    logger.error('3')
+                        self._last_played_station[0]))
                 # TODO: continue playing after changing playlist
                 # if self.player.isPlaying():
                 if self.playing > -1: