- Version 0.8.6

- Finalising playlist gistory
- https URLs will be converted to http before connecting
- Config / Default station: pading fixed

Author: s-n-g

Changelog

@@ -1,7 +1,10 @@
-2019-12-08 s-n-g
+2019-12-14 s-n-g
+    * Version 0.8.6
     * Adding playlist history (for local playlists)
-    * WINDOWS: Volume will be saved when mplayer is installed in %APPDATA%\pyradio
+    * https URLs will be converted to http before connecting
     * Fixing station moving when appending station
+    * Config / Default station: pading fixed
+    * WINDOWS: Volume will be saved when mplayer is installed in %APPDATA%\pyradio
 
 2019-11-15 s-n-g
     * PyRadio will not crush with mpv 0.30.0

README.html

@@ -267,6 +267,7 @@ <h3 id="mpv">MPV</h3>
 
 [pyradio]
 volume=50</pre>
+<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> If <strong>MPV 0.30.0</strong> is installed, there will be no visual notification when changing the volume. Furthermore, saving the volume value will <strong><em>not be possible</em></strong>. This is a <strong>pyradio</strong> bug and will be addressed in the future.</p>
 <h3 id="mplayer">MPlayer</h3>
 <p>MPlayer uses profiles to customize its behavior as well.</p>
 <p><strong>PyRadio</strong> defines a profile called “<strong>[pyradio]</strong>” in MPV’s configuration file (e.g. <em>~/.mplayer/config</em>). This profile will be used every time playback is started.</p>

README.md

@@ -380,6 +380,8 @@ Example:
     [pyradio]
     volume=50
 
+**Note:** If **MPV 0.30.0** is installed, there will be no visual notification when changing the volume. Furthermore, saving the volume value will ***not be possible***. This is a **pyradio** bug and will be addressed in the future.
+
 ### MPlayer
 
 MPlayer uses profiles to customize its behavior as well.

pyradio.1

@@ -1,7 +1,7 @@
 .\" Copyright (C) 2011 Ben Dowling <http://www.coderholic.com/pyradio>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH PYRADIO 1 "November 2019"
+.TH PYRADIO 1 "December 2019"
 
 .SH NAME
 .PP
@@ -434,6 +434,9 @@ Example:
 .br
 volume=50
 
+.IP \fBNote\fR
+If \fBMPV 0.30.0\fR is installed, there will be no visual notification when changing the volume. Furthermore, saving the volume value will \fInot be possible\fR. This is a \fBpyradio\fR bug and will be addressed in the future.
+
 .PP
 \fBMPlayer\fR
 .PP

pyradio/__init__.py

@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 8, 5)
+version_info = (0, 8, 6)
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__

pyradio/browser.py

@@ -152,7 +152,7 @@ class PyRadioBrowserInfoBrowser(PyRadioStationsBrowser):
     TITLE = 'Radio Browser'
 
     _open_url = \
-             'http://www.radio-browser.info/webservice/json/stations/topvote/100'
+            'http://www.radio-browser.info/webservice/json/stations/topvote/100'
     _open_headers = {'user-agent': 'PyRadio/dev'}
 
     _raw_stations = []
@@ -324,6 +324,7 @@ def search(self, data):
         self._last_search = post_data
         url = 'http://www.radio-browser.info/webservice/json/stations/search'
         try:
+            #r = requests.get(url=url)
             r = requests.get(url=url, headers=self._open_headers, json=post_data, timeout=self._search_timeout)
             r.raise_for_status()
             self._raw_stations = self._extract_data(json.loads(r.text))
@@ -447,16 +448,23 @@ def _extract_data(self, a_search_result):
         if a_search_result:
             for n in a_search_result:
                 ret.append({'name': n['name'].replace(',', ' ')})
-                ret[-1]['bitrate'] = n['bitrate']
-                ret[-1]['votes'] = n['votes']
                 ret[-1]['url'] = n['url']
                 ret[-1]['real_url'] = False
                 ret[-1]['played'] = False
                 ret[-1]['hls'] = n['hls']
                 ret[-1]['id'] = n['id']
                 ret[-1]['country'] = n['country']
+                if isinstance(n['clickcount'], int):
+                    # old API
+                    ret[-1]['votes'] = str(n['votes'])
+                    ret[-1]['clickcount'] = str(n['clickcount'])
+                    ret[-1]['bitrate'] = str(n['bitrate'])
+                else:
+                    # new API
+                    ret[-1]['votes'] = n['votes']
+                    ret[-1]['clickcount'] = n['clickcount']
+                    ret[-1]['bitrate'] = n['bitrate']
                 ret[-1]['language'] = n['language']
-                ret[-1]['clickcount'] = n['clickcount']
                 ret[-1]['encoding'] = ''
                 self._get_max_len(ret[-1]['votes'],
                                   ret[-1]['clickcount'])
@@ -468,9 +476,9 @@ def _get_max_len(self, votes, clicks):
         Parameters
         ----------
         votes
-            Number of station's vote
+            Number of station's vote (string)
         clicks 
-            Number of station's clicks
+            Number of station's clicks (string)
         numeric_data
 
         Returns
@@ -481,6 +489,7 @@ def _get_max_len(self, votes, clicks):
         """
 
         numeric_data = (votes, clicks)
+        logger.error('DE numeric_data = {}'.format(numeric_data))
         min_data = (6, 7)
         for i, n in enumerate(numeric_data):
             if len(n) > self._max_len[i]:
@@ -804,6 +813,7 @@ def get_data_dict(data):
 
 def probeBrowsers(a_browser_url):
     base_url = a_browser_url.split('/')[2]
+    logger.error('DE base_url = ' + base_url)
     if not base_url:
         base_url = a_browser_url
     implementedBrowsers = PyRadioStationsBrowser.__subclasses__()

pyradio/config_window.py

@@ -939,6 +939,9 @@ class PyRadioSelectPlaylist(object):
     pageChange = 5
     jumpnr = ''
 
+    # offset to current item for padding calculation
+    pad_adjustment = 0
+
     def __init__(self, parent, config_path, default_playlist):
         self._parent_maxY, self._parent_maxX = parent.getmaxyx()
         self._config_path = config_path
@@ -1006,7 +1009,8 @@ def refresh_selection(self, resizing=False):
             self._win.hline(self.maxY - 4, 1, ' ', self.maxX - 2, curses.color_pair(5))
 
         else:
-            pad = len(str(self.startPos + self.maxY - 2))
+            pad = len(str(self.startPos + self.maxY - 2 - self.pad_adjustment))
+            #logger.error('DE \n\npos = {0}, pad = {1}\n\n'.format(self.startPos + self.maxY - 2 - self.pad_adjustment, pad))
             for i in range(0, self.maxY - 2):
                 if i + self.startPos < self._num_of_items:
                     line, pad = self._format_line(i, pad)
@@ -1290,6 +1294,8 @@ def __init__(self, parent, config_path, default_playlist, default_station):
         logger.info('self._default_playlist = ' + self._default_playlist)
         PyRadioSelectPlaylist.__init__(self, parent, config_path, default_station)
         self._title = ' Station Selection '
+        # adding 2 to padding calculation (i.e. no selection and random selection
+        self.pad_adjustment = 2
 
     def _calculate_width(self):
         self.maxX = 64
@@ -1373,7 +1379,7 @@ def _get_color(self, i):
 
     def _format_line(self, i, pad):
         """ PyRadioSelectStation format line """
-        fixed_pad = pad - 2
+        fixed_pad = pad
         if i + self.startPos < 2:
             line = '{0}  {1}'.format(' '.rjust(fixed_pad),
                 self._items[i + self.startPos])

pyradio/main.py

@@ -179,7 +179,7 @@ def shell():
         logging.raiseExceptions = False
         logging.lastResort = None
 
-    if requested_player is '':
+    if requested_player == '':
         requested_player = pyradio_config.player
     #else:
     #    pyradio_config.requested_player = requested_player

pyradio/player.py

@@ -540,16 +540,17 @@ 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", streamUrl, "--input-ipc-server=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--quiet", "--playlist", http_url, "--input-ipc-server=" + self.mpvsocket]
             else:
-                opts = [self.PLAYER_CMD, "--quiet", "--playlist", streamUrl, "--input-unix-socket=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--quiet", "--playlist", http_url, "--input-unix-socket=" + self.mpvsocket]
         else:
             if newerMpv:
-                opts = [self.PLAYER_CMD, "--quiet", streamUrl, "--input-ipc-server=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--quiet", http_url, "--input-ipc-server=" + self.mpvsocket]
             else:
-                opts = [self.PLAYER_CMD, "--quiet", streamUrl, "--input-unix-socket=" + self.mpvsocket]
+                opts = [self.PLAYER_CMD, "--quiet", http_url, "--input-unix-socket=" + self.mpvsocket]
         if self.USE_PROFILE == -1:
             self.USE_PROFILE = self._configHasProfile()
 
@@ -655,10 +656,11 @@ 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", streamUrl]
+            opts = [self.PLAYER_CMD, "-quiet", "-playlist", http_url]
         else:
-            opts = [self.PLAYER_CMD, "-quiet", streamUrl]
+            opts = [self.PLAYER_CMD, "-quiet", http_url]
         if self.USE_PROFILE == -1:
             self.USE_PROFILE = self._configHasProfile()
 
@@ -735,7 +737,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]
+        opts = [self.PLAYER_CMD, "-Irc", "-vv", streamUrl.replace('https://', 'http://')]
         return opts
 
     def _mute(self):

pyradio/radio.py

@@ -1987,7 +1987,7 @@ def _set_active_stations(self):
                 self.active_stations = [
                         [ '', self.selection ],
                         [ '', -1 ] ]
-        logger.error('DE active_stations = \n\n{}\n\n'.format(self.active_stations))
+        #logger.error('DE active_stations = \n\n{}\n\n'.format(self.active_stations))
 
     def get_active_encoding(self, an_encoding):
         if an_encoding:
@@ -2319,7 +2319,7 @@ def _open_playlist_from_history(self, reset=False):
         removed_playlist_history_item = self._cnf.remove_from_playlist_history()
         err_string = '"|{}|"'.format(self._cnf.station_title)
 
-        logger.error('DE\n\n Opening: "{}"\n\n'.format(self._cnf.station_path))
+        #logger.error('DE\n\n Opening: "{}"\n\n'.format(self._cnf.station_path))
         ret = self._cnf.read_playlist_file(self._cnf.station_path)
 
         if ret == -1: