adding mplayer_save_br config option

Author: s-n-g

pyradio/config

@@ -151,6 +151,19 @@ force_http = False
 # Default value = 0
 buffering = 0
 
+# MPlayer auto update bitrate
+# This option is only relevant if MPlayer is installed.
+# In this case, if the station's bitrate is different to 128kbps,
+# the station will be updated and the playlist will be silently saved.
+#
+# This is because MPlayer buffering uses KB instead of seconds (as
+# MPV and VLC do). Since buffering (the previous option) is expressed
+# in seconds, having the station's real bitrate is essential in
+# order to calculate the correct value (seconds to KB).
+#
+# Default value: False
+mplayer_save_br = False
+
 # Default theme
 # Hard coded themes:
 #   dark (default) (8 colors)

pyradio/config.py

@@ -1385,6 +1385,7 @@ class PyRadioConfig(PyRadioStations):
     opts['connection_timeout'] = ['Connection timeout: ', '10']
     opts['force_http'] = ['Force http connections: ', False]
     opts['buffering'] = ['Buffering (seconds): ', '20']
+    opts['mplayer_save_br'] = ['  MPlayer auto save br: ', False]
     opts['notification'] = ['Notifications', '']
     opts['enable_notifications'] = ['Enable notifications: ', '-1']
     opts['use_station_icon'] = ['    Use station icon: ', True]
@@ -1541,6 +1542,15 @@ def __init__(self, user_config_dir=None, headless=False):
 
         self._read_notification_command()
 
+    @property
+    def mplayer_save_br(self):
+        return self.opts['mplayer_save_br'][1]
+
+    @mplayer_save_br.setter
+    def mplayer_save_br(self, val):
+        self.opts['mplayer_save_br'][1] = val
+        self.opts['dirty_config'][1] = True
+
     @property
     def buffering(self):
         return self.opts['buffering'][1]
@@ -2369,7 +2379,12 @@ def _read_config(self, distro_config=False):
                 return -2
             for i in range(len(sp)):
                 sp[i] = sp[i].strip()
-            if sp[0] == 'show_no_themes_message':
+            if sp[0] == 'mplayer_save_br':
+                self.mplayer_save_br = True
+                st = sp[1].strip()
+                if st.lower() == 'false':
+                    self.mplayer_save_br = False
+            elif sp[0] == 'show_no_themes_message':
                 self.show_no_themes_message = True
                 st = sp[1].strip()
                 if st.lower() == 'false':
@@ -4396,8 +4411,11 @@ def add(self, an_item):
                  0 : Item added
                  1 : Item already in favorites
         '''
+        if an_item[0] == '' or \
+                an_item[1] == '':
+            return -1, '___Station is invalid!___'
+
         items = self._read_csv()
-        url = an_item[1]
         updated = False
         write_it = True
 
@@ -4407,19 +4425,11 @@ def add(self, an_item):
         while this_item[-1] == '':
             this_item.pop()
 
-        for i, item in enumerate(this_item):
-            if item is None:
-                if i in range(0, 2):
-                    return -1, '___Station is invalid!___'
-                this_item[i] = ''
-            if this_item[0] == '' or \
-                    this_item[1] == '':
-                return -1, '___Station is invalid!___'
         if isinstance(this_item[-1], dict):
             this_item[-1] = this_item[-1]['image']
         msg = None
         for i, item in enumerate(items):
-            if item[1] == url:
+            if item[1] == this_item[1]:
                 if item == this_item:
                     return 1, '___Already in favorites!___'
                 items[i] = this_item
@@ -4434,15 +4444,6 @@ def add(self, an_item):
             return ret[0], msg if msg else ret[1]
         return 1, '___Already in favorites!___'
 
-    # def remove(self, an_item):
-    #     items = self._read_csv()
-    #     name = an_item[0]
-    #     url = an_item[1]
-    #     new_items = [item for item in items if item[0] != name and item[1] != url]
-
-    #     if len(new_items) != len(items):
-    #         self._write_csv(new_items)
-
     def _read_csv(self):
         items = []
         try:

pyradio/config_window.py

@@ -86,6 +86,7 @@ class PyRadioConfigWindow():
     _help_text.append(['Most radio stations use plain old http protocol to broadcast, but some of them use https.', '|', 'If this parameter is enabled, all connections will use http; results depend on the combination of station/player.', '|', 'This value is read at program startup, use "' + to_str('https') +  '" to change its effect while mid-session.',
     '|', 'Default value: False'])
     _help_text.append(['This is the number of seconds the players will buffer data before actually staring playback.', '|', 'This is a global setting; it affects all stations.', '|', 'Please keep in mind that stations may have their own buffering value defined. In this case that value will be used instead of this global value.', '|', 'Accepted values:', '    5 - 60 seconds', '    0 disables buffering', '|', 'Default value: 0'])
+    _help_text.append(['This option is only relevant if MPlayer is installed.', '|', "In this case, if the station's bitrate is different to 128kbps, the station will be updated and the playlist will be silently saved.", '|', "This is because MPlayer buffering uses KB instead of seconds (as MPV and VLC do). Since buffering (the previous option) is expressed in seconds, having the station's real bitrate is essential in order to calculate the correct value (seconds to KB).", '|', 'Default value: False'])
     _help_text.append(None)
     _help_text.append(['If this options is enabled, a Desktop Notification will be displayed using the notification daemon / service.', '|', 'If enabled but no notification is displayed, please refer to', 'https://github.com/coderholic/pyradio/desktop-notification.md', '|', 'Valid values are:', '   -1: disabled ', '    0: enabled (no repetition) ', '    x: repeat every x seconds ', '|', 'Default value: -1'])
     _help_text.append(['Notice: Not applicable on Windows!', '|',  'Online Radio Directory Services (like RadioBrowser) will usually provide an icon for the stations they advertise.', '|', 'PyRadio can use this icon (provided that one exists and is of JPG or PNG format) while displaying Desktop Notifications.', '|', 'Setting this option to True, will enable the behavior above.', '|', 'If this option is False, the default icon will be used.', '|', 'Default value: True'])
@@ -765,6 +766,7 @@ def keypress(self, char):
                 'calculated_color_factor',
                 'time_format',
                 'buffering',
+                'mplayer_save_br',
             ) and char in (
                 curses.KEY_LEFT,
                 curses.KEY_RIGHT,
@@ -1089,7 +1091,8 @@ def keypress(self, char):
                     sel == 'enable_clock' or \
                     sel == 'wheel_adjusts_volume' or \
                     sel == 'log_titles' or \
-                    sel == 'remove_station_icons':
+                    sel == 'remove_station_icons' or \
+                    sel == 'mplayer_save_br':
                 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

@@ -1070,6 +1070,10 @@ def _update_config_buffering_data(self, reset=True):
             x = None
 
     def _update_bitrate(self, bitrate):
+        if not self._cnf.mplayer_save_br:
+            if logger.isEnabledFor(logging.DEBUG):
+                logger.debug('not updating bitrate, mplayer_save_br = False')
+            return
         if self.playing > -1:
             if self._last_played_station == self.stations[self.playing]:
                 # make sure mplayer is installed