random station selection keeps on until a working station is found

Author: s-n-g

Changelog

@@ -1,12 +1,15 @@
-2019-02-01  s-n-g
+2019-02-03  s-n-g
 
-    * Trying to minimize the possibility of curses layout breakage
+    * Avoiding curses layout breakage due to BROKEN PIPE errors
     * Start of playback detection implemented. This is done by
       detecting the players audio decoder info, which actually mean
       that playback is on. If not detected within a timeout value,
       failure to connect is presumed
-    * Volume adjustment, saving and muting inhibited before start
+    * Volume adjustment, saving and muting is inhibited before start
       of playback is detected
+	* Playing a station in random order will not stop until a
+	  working station is acquired or another action is taken (e.g 
+	  pressing a key)
     * Adding search function for both player and playlist mode
     * Stations name is limited to window width
 	* Station title is validated before displayed

pyradio/config

@@ -45,7 +45,8 @@ default_encoding = utf-8
 # 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 "Connection failed" message.
+# unreachable, and display the "Failed to connect to: [station]"
+# message.
 #
 # Valid values: 1 - ..
 # Default value: 10

pyradio/config.py

@@ -627,7 +627,8 @@ def _save_config(self):
 # 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 "Connection failed" message.
+# unreachable, and display the "Failed to connect to: [station]"
+# message.
 #
 # Valid values: 1 - ..
 # Default value: 10

pyradio/edit.py

@@ -2,7 +2,7 @@
 import curses.ascii
 import logging
 from sys import version_info
-from .simple_widgets import SimpleCursesLineEdit
+from .simple_curses_widgets import SimpleCursesLineEdit
 from .log import Log
 
 import locale
@@ -16,8 +16,8 @@ class PyRadioSearch(SimpleCursesLineEdit):
 
     def __init__(self, parent, begin_y, begin_x, **kwargs):
         SimpleCursesLineEdit.__init__(self, parent, begin_y, begin_x,
-            key_up_function_handler=self._get_history_previous,
-            key_down_function_handler=self._get_history_next,
+            key_up_function_handler=self._get_history_next,
+            key_down_function_handler=self._get_history_previous,
             **kwargs)
         if version_info < (3, 0):
             self._range_command='xrange'

pyradio/player.py

@@ -228,8 +228,8 @@ def updateStatus(self, *args):
                     else:
                         if self.oldUserInput['Title'] == '':
                             self.oldUserInput['Title'] = 'Connecting to: "{}"'.format(self.name)
-                            if (logger.isEnabledFor(logging.DEBUG)):
-                                logger.debug('Connecting to: "{}"'.format(self.name))
+                            if (logger.isEnabledFor(logging.INFO)):
+                                logger.info('Connecting to: "{}"'.format(self.name))
                             self.outputStream.write(self.oldUserInput['Title'])
         except:
             if logger.isEnabledFor(logging.ERROR):
@@ -290,7 +290,9 @@ def play(self, name, streamUrl, encoding = ''):
         self.show_volume = True
         self.title_prefix = ''
         self.playback_is_on = False
-        self.outputStream.write('Station: {}'.format(name), self.status_update_lock)
+        self.outputStream.write('Station: "{}"'.format(name), self.status_update_lock)
+        if logger.isEnabledFor(logging.INFO):
+            logger.info('Selected Station: "{}"'.format(name))
         if encoding:
             self._station_encoding = encoding
         else:
@@ -626,6 +628,12 @@ def _format_title_string(self, title_string):
             ret_string = tmp[:tmp.find("';")]
         else:
             ret_string = title_string
+        if '"artist":"' in ret_string:
+            """ work on format:
+                ICY Info: START_SONG='{"artist":"Clelia Cafiero","title":"M. Mussorgsky-Quadri di un'esposizione"}';
+                Fund on "ClassicaViva Web Radio: Classical"
+            """
+            ret_string = self.icy_title_prefix + ret_string[ret_string.find('"artist":')+10:].replace('","title":"', ' - ').replace('"}\';', '')
         return self._title_string_format_text_tag(ret_string)
 
     def _format_volume_string(self, volume_string):