adding force http connections config option

Author: s-n-g

pyradio/config.py

@@ -919,7 +919,9 @@ class PyRadioConfig(PyRadioStations):
     opts[ 'default_playlist' ] = [ 'Def. playlist: ', 'stations' ]
     opts[ 'default_station' ] = [ 'Def station: ', 'False' ]
     opts[ 'default_encoding' ] = [ 'Def. encoding: ', 'utf-8' ]
+    opts[ 'conn_title' ] = [ 'Connection Options: ', '' ]
     opts[ 'connection_timeout' ] = [ 'Connection timeout: ', '10' ]
+    opts[ 'force_http' ] = [ 'Force http connections: ', False ]
     opts[ 'theme_title' ] = [ 'Theme Options', '' ]
     opts[ 'theme' ] = [ 'Theme: ', 'dark' ]
     opts[ 'use_transparency' ] = [ 'Use transparency: ', False ]
@@ -938,6 +940,7 @@ def __init__(self):
         self.auto_save_playlist = False
         self.default_playlist = 'stations'
         self.default_station = 'False'
+        self.force_http = False
         self.default_encoding = 'utf-8'
         self.connection_timeout = '10'
         self.theme = 'dark'
@@ -978,6 +981,15 @@ def player(self, val):
         self.opts['player'][1] = val
         self.opts['dirty_config'][1] = True
 
+    @property
+    def force_http(self):
+        return self.opts['force_http'][1]
+
+    @force_http.setter
+    def force_http(self, val):
+        self.opts['force_http'][1] = val
+        self.opts['dirty_config'][1] = True
+
     @property
     def use_transparency(self):
         return self.opts['use_transparency'][1]
@@ -1043,13 +1055,34 @@ def auto_save_playlist(self, val):
 
     @property
     def connection_timeout(self):
+        """ connection timeout as string """
         return self.opts['connection_timeout'][1]
 
     @connection_timeout.setter
     def connection_timeout(self, val):
         self.opts['connection_timeout'][1] = val
         self.opts['dirty_config'][1] = True
 
+    @property
+    def connection_timeout_int(self):
+        """ connection timeout as integer
+            if < 5 or > 60, set to 10
+            On error set to 10
+            Read only
+        """
+        try:
+            ret = int(self.opts['connection_timeout'][1])
+            if not 5 <= ret <= 60:
+                ret = 10
+        except:
+            ret = 10
+        self.opts['connection_timeout'][1] = str(ret)
+        return ret
+
+    @connection_timeout_int.setter
+    def connection_timeout_int(self, val):
+        return
+
     @property
     def theme(self):
         return self.opts['theme'][1]
@@ -1161,6 +1194,8 @@ def read_config(self):
                     self.opts['player'][1] = sp[1].lower().strip()
             elif sp[0] == 'connection_timeout':
                 self.opts['connection_timeout'][1] = sp[1].strip()
+                # check integer number and set to 10 if error
+                x = self.connection_timeout_int
             elif sp[0] == 'default_encoding':
                 self.opts['default_encoding'][1] = sp[1].strip()
             elif sp[0] == 'theme':
@@ -1195,6 +1230,11 @@ def read_config(self):
                     self.opts['use_transparency'][1] = True
                 else:
                     self.opts['use_transparency'][1] = False
+            elif sp[0] == 'force_http':
+                if sp[1].lower() == 'true':
+                    self.opts['force_http'][1] = True
+                else:
+                    self.opts['force_http'][1] = False
         self.opts['dirty_config'][1] = False
         return 0
 
@@ -1268,6 +1308,15 @@ def save_config(self):
 # Default value: 10
 connection_timeout = {4}
 
+# Force http connections
+# Most radio stations use plain old http protocol to broadcast, but
+# some of them use https. If this is enabled,  all connections will
+# use http; results depend on the combination of station/player.
+#
+# Valid values: True, true, False, false
+# Default value: False
+force_http = {5}
+
 # Default theme
 # Hardcooded themes:
 #   dark (default) (8 colors)
@@ -1277,7 +1326,7 @@ def save_config(self):
 #   black_on_white (bow) (256 colors)
 #   white_on_black (wob) (256 colors)
 # Default value = 'dark'
-theme = {5}
+theme = {6}
 
 # Transparency setting
 # If False, theme colors will be used.
@@ -1286,7 +1335,7 @@ def save_config(self):
 # not running, the terminal's background color will be used.
 # Valid values: True, true, False, false
 # Default value: False
-use_transparency = {6}
+use_transparency = {7}
 
 
 # Playlist management
@@ -1295,20 +1344,20 @@ def save_config(self):
 # every station deletion action
 # Valid values: True, true, False, false
 # Default value: True
-confirm_station_deletion = {7}
+confirm_station_deletion = {8}
 
 # Specify whether you will be asked to confirm
 # playlist reloading, when the playlist has not
 # been modified within Pyradio
 # Valid values: True, true, False, false
 # Default value: True
-confirm_playlist_reload = {8}
+confirm_playlist_reload = {9}
 
 # Specify whether you will be asked to save a
 # modified playlist whenever it needs saving
 # Valid values: True, true, False, false
 # Default value: False
-auto_save_playlist = {9}
+auto_save_playlist = {10}
 
 '''
         copyfile(self.config_file, self.config_file + '.restore')
@@ -1321,6 +1370,7 @@ def save_config(self):
                     self.opts['default_station'][1],
                     self.opts['default_encoding'][1],
                     self.opts['connection_timeout'][1],
+                    self.opts['force_http'][1],
                     self.opts['theme'][1],
                     self.opts['use_transparency'][1],
                     self.opts['confirm_station_deletion'][1],

pyradio/config_window.py

@@ -56,9 +56,12 @@ class PyRadioConfigWindow(object):
     _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(None)
     _help_text.append(['PyRadio will wait for this number of seconds to get a station/server message indicating that playback has actually started.', '|',
     'If this does not happen within this number of seconds after the connection is initiated, PyRadio will consider the station unreachable, and display the "Failed to connect to: station" message.', '|', 'Press "h"/Left or "l"/Right to change value.',
     '|', 'Valid values: 5 - 60', 'Default value: 10'])
+    _help_text.append(['Most radio stations use plain old http protocol to broadcast, but some of them use https.', '|', 'If this is enabled, all connections will use http; results depend on the combination of station/player.', '|', 'This value is read at program startup, use Ctrl-S to change its effect while mid-session.',
+    '|', 'Default value: False'])
     _help_text.append(None)
     _help_text.append(['The theme to be used by default.', '|',
     'This is the equivalent to the -t , --theme command line option.', '|',
@@ -266,6 +269,7 @@ def _load_default_values(self):
         # Transparency
         #self._old_use_transparency = self._config_options['use_transparency'][1]
         self._config_options[ 'use_transparency' ][1] = False
+        self._config_options[ 'force_http' ][1] = False
         self._toggle_transparency_function(changed_from_config_window=True, force_value=False)
         self._config_options[ 'playlist_manngement_title' ][1] = ''
         self._config_options[ 'confirm_station_deletion' ][1] = True
@@ -413,7 +417,8 @@ def keypress(self, char):
                 return self.n_u.SELECT_STATION_MODE, []
             elif sel == 'confirm_station_deletion' or \
                     sel == 'confirm_playlist_reload' or \
-                    sel == 'auto_save_playlist':
+                    sel == 'auto_save_playlist' or \
+                    sel == 'force_http':
                 self._config_options[sel][1] = not self._config_options[sel][1]
                 self.refresh_selection()
             elif sel == 'use_transparency':

pyradio/main.py

@@ -15,7 +15,7 @@
 IMPLEMENTED_PLAYERS =('mpv', 'mplayer', 'cvlc')
 
 @contextmanager
-def pyradio_config_manager():
+def pyradio_config_file():
     cf = PyRadioConfig()
     try:
         yield cf
@@ -89,7 +89,7 @@ def shell():
     args = parser.parse_args()
     sys.stdout.flush()
 
-    with pyradio_config_manager() as pyradio_config:
+    with pyradio_config_file() as pyradio_config:
 
         if args.unlock:
             pyradio_config.locked = False

pyradio/player.py

@@ -148,15 +148,14 @@ class Player(object):
     def __init__(self, outputStream,
             config_encoding,
             playback_timeout,
+            force_http,
             playback_timeout_counter,
             playback_timeout_handler,
             info_display_handler):
         self.outputStream = outputStream
         self.config_encoding = config_encoding
-        try:
-            self.playback_timeout = int(playback_timeout)
-        except:
-            self.playback_timeout = 10
+        self.playback_timeout = playback_timeout
+        self.force_http = force_http
         self.playback_timeout_counter = playback_timeout_counter
         self.playback_timeout_handler = playback_timeout_handler
         self.info_display_handler = info_display_handler
@@ -165,6 +164,12 @@ def __init__(self, outputStream,
     def __del__(self):
         self.close()
 
+    def _url_to_use(self, streamUrl):
+        if self.force_http:
+            return streamUrl.replace('https://', 'http://')
+        else:
+            return streamUrl
+
     def save_volume(self):
         pass
 
@@ -872,13 +877,20 @@ def play(self, name, streamUrl, encoding = ''):
         t.start()
         # start playback check timer thread
         self.stop_timeout_counter_thread = False
+        logger.error('=========================')
+        logger.error('function self.playback_timeout_counter = {}'.format(self.playback_timeout_counter))
+        logger.error('int self.playback_timeout = {}'.format(self.playback_timeout))
+        logger.error('str self.name = {}'.format(self.name))
+        logger.error('=========================')
         try:
             self.connection_timeout_thread = threading.Thread(
                     target=self.playback_timeout_counter,
                     args=(self.playback_timeout,
                         self.name,
                         lambda: self.stop_timeout_counter_thread))
             self.connection_timeout_thread.start()
+            if (logger.isEnabledFor(logging.ERROR)):
+                logger.error("playback detection thread started")
         except:
             self.connection_timeout_thread = None
             if (logger.isEnabledFor(logging.ERROR)):
@@ -949,7 +961,10 @@ def toggleMute(self):
             self._mute()
         if self.muted:
             if self.delay_thread is not None:
-                self.delay_thread.cancel()
+                try:
+                    self.delay_thread.cancel()
+                except:
+                    pass
             self.title_prefix = '[Muted] '
             self.show_volume = False
         else:
@@ -1084,7 +1099,7 @@ def _buildStartOpts(self, streamUrl, playList=False):
         """ Builds the options to pass to subprocess."""
 
         """ Test for newer MPV versions as it supports different IPC flags. """
-        p = subprocess.Popen([self.PLAYER_CMD, "--input-ipc-server"], stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=False)
+        p = subprocess.Popen([self.PLAYER_CMD, "--no-video",  "--input-ipc-server"], stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=False)
         out = p.communicate()
         if "not found" not in str(out[0]):
             if logger.isEnabledFor(logging.DEBUG):
@@ -1095,17 +1110,16 @@ def _buildStartOpts(self, streamUrl, playList=False):
                 logger.debug("--input-ipc-server is not supported.")
             newerMpv = 0;
 
-        http_url = streamUrl.replace('https://', 'http://')
         if playList:
             if newerMpv:
-                opts = [self.PLAYER_CMD, "--quiet", "--playlist=" + http_url, "--input-ipc-server=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--no-video", "--quiet", "--playlist=" + self._url_to_use(streamUrl), "--input-ipc-server=" + self.mpvsocket]
             else:
-                opts = [self.PLAYER_CMD, "--quiet", "--playlist=" + http_url, "--input-unix-socket=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--no-video", "--quiet", "--playlist=" + self._url_to_use(streamUrl), "--input-unix-socket=" + self.mpvsocket]
         else:
             if newerMpv:
-                opts = [self.PLAYER_CMD, "--quiet", http_url, "--input-ipc-server=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--no-video", "--quiet", self._url_to_use(streamUrl), "--input-ipc-server=" + self.mpvsocket]
             else:
-                opts = [self.PLAYER_CMD, "--quiet", http_url, "--input-unix-socket=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--no-video", "--quiet", self._url_to_use(streamUrl), "--input-unix-socket=" + self.mpvsocket]
         if self.USE_PROFILE == -1:
             self.USE_PROFILE = self._configHasProfile()
 
@@ -1412,11 +1426,10 @@ def _configHasProfile(self):
 
     def _buildStartOpts(self, streamUrl, playList=False):
         """ Builds the options to pass to subprocess."""
-        http_url = streamUrl.replace('https://', 'http://')
         if playList:
-            opts = [self.PLAYER_CMD, "-quiet", "-playlist", http_url]
+            opts = [self.PLAYER_CMD, "-vo", "null", "-quiet", "-playlist", self._url_to_use(streamUrl)]
         else:
-            opts = [self.PLAYER_CMD, "-quiet", http_url]
+            opts = [self.PLAYER_CMD, "-vo", "-quiet", self._url_to_use(streamUrl)]
         if self.USE_PROFILE == -1:
             self.USE_PROFILE = self._configHasProfile()
 
@@ -1507,8 +1520,7 @@ def save_volume(self):
 
     def _buildStartOpts(self, streamUrl, playList=False):
         """ Builds the options to pass to subprocess."""
-        #opts = [self.PLAYER_CMD, "-Irc", "--quiet", streamUrl]
-        opts = [self.PLAYER_CMD, "-Irc", "-vv", streamUrl.replace('https://', 'http://')]
+        opts = [self.PLAYER_CMD, "--no-video", "-Irc", "-vv", self._url_to_use(streamUrl)]
         return opts
 
     def _mute(self):

pyradio/radio.py

@@ -387,7 +387,8 @@ def setup(self, stdscr):
         try:
             self.player = player.probePlayer(requested_player=self.requested_player)(self.log,
                     self._cnf.default_encoding,
-                    self._cnf.connection_timeout,
+                    self._cnf.connection_timeout_int,
+                    self._cnf.force_http,
                     self.playbackTimeoutCounter,
                     self.connectionFailed,
                     self._show_station_info_from_thread)
@@ -889,6 +890,7 @@ def playSelection(self):
 
     def playbackTimeoutCounter(self, *args):
         timeout = args[0]
+        logger.info('DE \n\ntimeout = {}\n\n'.format(timeout))
         station_name = args[1]
         stop = args[2]
         if stop():