- config.py: favorites will eliminate trailing commas

- player.py: fixing a crash in _calculate_buffer_size_in_kb

Author: s-n-g

pyradio/config.py

@@ -4401,27 +4401,33 @@ def add(self, an_item):
         updated = False
         write_it = True
 
-        for i, item in enumerate(an_item):
+        this_item = an_item[:]
+        if this_item[Station.buffering] == '0@128':
+            this_item[Station.buffering] = ''
+        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!___'
-                an_item[i] = ''
-            if an_item[0] == '' or \
-                    an_item[1] == '':
+                this_item[i] = ''
+            if this_item[0] == '' or \
+                    this_item[1] == '':
                 return -1, '___Station is invalid!___'
-        if isinstance(an_item[-1], dict):
-            an_item[-1] = an_item[-1]['image']
+        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 == an_item:
+                if item == this_item:
                     return 1, '___Already in favorites!___'
-                items[i] = an_item
+                items[i] = this_item
                 msg = '___Station updated!___'
                 updated = True
                 break
         if not updated:
-            items.append(an_item)
+            items.append(this_item)
             updated = True
         if updated:
             ret = self._write_csv(items)
@@ -4474,8 +4480,11 @@ def _read_csv(self):
 
                         station_info = [
                             name, url, enc, {'image': icon} if icon else '',
-                            profile, buffering, http, volume, referer
+                            profile, '' if buffering == '0@128' else buffering,
+                            http, volume, referer
                         ]
+                        while station_info[-1] == '':
+                            station_info.pop()
                         items.append(station_info)
                 except (csv.Error, ValueError):
                     return []

pyradio/player.py

@@ -2873,6 +2873,9 @@ def _buildStartOpts(self, streamName, streamUrl, station_force_http, streamRefer
                     else:
                         logger.info('No usable profile found')
 
+        # TODO: use pyradio-volume profile
+        if self.station_volume != -1:
+            logger.error('I need to use pyradio-volume profile')
         # logger.error('\n\nself._recording = {}'.format(self._recording))
         if self._recording > 0:
             self.recording_filename = self.get_recording_filename(self.name, '.mkv')
@@ -3321,7 +3324,8 @@ def _calculate_buffer_size_in_kb(self, delay_seconds, bitrate_kbps=None):
         ''' return delay in KB for mplayer '''
         if bitrate_kbps is None:
             bitrate_kbps = 128
-        if '@' in delay_seconds:
+        if isinstance(delay_seconds, str) and \
+                '@' in delay_seconds:
             sp = delay_seconds.split('@')
             delay_seconds = sp[0]
             bitrate_kbps = sp[1]
@@ -3415,6 +3419,9 @@ def _buildStartOpts(self, streamName, streamUrl, station_force_http, streamRefer
                     else:
                         logger.info('No usable profile found')
 
+        # TODO: use pyradio-volume profile
+        if self.station_volume != -1:
+            logger.error('I need to use pyradio-volume profile')
 
         ''' this will set the profile too '''
         params = self.params[self.params[0]]