- handling opening empty Radio Browser result

- adding hex to rgb functions
- Radio Browser search is probably broken

Author: s-n-g

pyradio/browser.py

@@ -273,6 +273,13 @@ def initialize(self):
                 'post_data': {'order': 'votes', 'reverse': 'true'},
             })
             self._search_history_index = 1
+
+            self._search_history.append({
+                'type': 'search',
+                'term': '',
+                'post_data': {'name': 'jazsssss'},
+            })
+            self._search_history_index = 2
             return True
         return False
 
@@ -477,9 +484,12 @@ def search(self, go_back_in_history=True):
         try:
             # r = requests.get(url=url)
             r = self._session.get(url=url, headers=self._headers, params=post_data, timeout=(self._search_timeout, 2 * self._search_timeout))
+            logger.error('== request sent ')
             r.raise_for_status()
+            logger.error('== request raised ')
             self._raw_stations = self._extract_data(json.loads(r.text))
-            # logger.error('DE \n\n{}'.format(self._raw_stations))
+            logger.error('== got reply')
+            logger.error('DE \n\n{}'.format(self._raw_stations))
             ret = True, go_back_in_history
         except requests.exceptions.RequestException as e:
             if logger.isEnabledFor(logging.ERROR):
@@ -527,6 +537,14 @@ def _get_search_elements(self, a_search):
             elif a_type == 'tags':
                 self.search_by = 'tags'
 
+        if self.search_by is None:
+            if p_data:
+                if 'name' in p_data.keys():
+                    self.search_by = 'name'
+
+        if self.search_by is None:
+            self.search_by = 'name'
+
     def get_next(self, search_term, start=0, stop=None):
         if search_term:
             for n in range(start, len(self._raw_stations)):
@@ -625,6 +643,13 @@ def _format_url(self, a_search):
             )
             self._search_type = 1
 
+        elif a_search['type'] == 'search':
+            url = 'http://{0}{1}'.format(
+                self._server,
+                '/json/stations/search'
+            )
+            self._search_type = 2
+
         return url
 
     def format_empty_line(self, width):
@@ -1105,14 +1130,21 @@ def do_search(self, parent=None, init=False):
 
 class RadioBrowserInfoSearchWindow(object):
 
+    # search_by_items = (
+    #     'No search term',
+    #     'Name',
+    #     'Tag',
+    #     'Country',
+    #     'State',
+    #     'Codec',
+    #     'Language',
+    # )
+
     search_by_items = (
-        'No search term',
-        'Name',
-        'Tag',
-        'Country',
-        'State',
-        'Codec',
-        'Language',
+        'Votes',
+        'Clicks',
+        'Recent click',
+        'Recently changed'
     )
 
     sort_by_items = (
@@ -1195,22 +1227,27 @@ def show(self):
         for i, n in enumerate(self._widgets):
             if n is None:
                 if i == 0:
-                    self._widgets[0] = SimpleCursesLineEdit(
-                        parent=self._win,
-                        width=-2,
-                        begin_y=3,
-                        begin_x=2,
-                        boxed=False,
-                        has_history=False,
-                        caption='',
-                        box_color=curses.color_pair(9),
-                        caption_color=curses.color_pair(4),
-                        edit_color=curses.color_pair(9),
-                        cursor_color=curses.color_pair(8),
-                        unfocused_color=curses.color_pair(5),
-                        string_changed_handler='')
-                    self._widgets[0].bracket = False
-                    self._line_editor = self._widgets[0]
+                    self._widgets[2] = SimpleCursesCheckBox(
+                        1, 2, 'Display by',
+                        curses.color_pair(9),
+                        curses.color_pair(4),
+                        curses.color_pair(5))
+                    #self._widgets[0] = SimpleCursesLineEdit(
+                    #    parent=self._win,
+                    #    width=-2,
+                    #    begin_y=3,
+                    #    begin_x=2,
+                    #    boxed=False,
+                    #    has_history=False,
+                    #    caption='',
+                    #    box_color=curses.color_pair(9),
+                    #    caption_color=curses.color_pair(4),
+                    #    edit_color=curses.color_pair(9),
+                    #    cursor_color=curses.color_pair(8),
+                    #    unfocused_color=curses.color_pair(5),
+                    #    string_changed_handler='')
+                    #self._widgets[0].bracket = False
+                    #self._line_editor = self._widgets[0]
                 elif i == 1:
                     ''' search by '''
                     self._widgets[i] = SimpleCursesWidgetColumns(
@@ -1249,7 +1286,7 @@ def show(self):
                 elif i == 4:
                     '''' sort ascending / descending '''
                     self._widgets[4] = SimpleCursesCheckBox(
-                            self._widgets[3].Y + self._widgets[3].height + 2, self._widgets[3].X - 2 + self._widgets[3].margin,
+                            self._widgets[3].Y + self._widgets[3].height + 1, self._widgets[3].X - 2 + self._widgets[3].margin,
                             'Sort descending',
                             curses.color_pair(9), curses.color_pair(4), curses.color_pair(5))
                 elif i == 5:
@@ -1289,16 +1326,15 @@ def show(self):
             self._h_buttons.calculate_buttons_position()
             for n in range(1, len(self._widgets)):
                 if self._widgets[n]:
-                    if i in (2, 4):
-                        if i == 2:
+                    if n in (2, 4):
+                        if n == 2:
                             self._widgets[2].Y = self._widgets[1].Y + self._widgets[1].height + 2
                         else:
-                            self._widgets[4].Y = self._widgets[3].Y + self._widgets[3].height + 2
+                            self._widgets[4].Y = self._widgets[3].Y + self._widgets[3].height + 1
                             self._widgets[4].X = self._widgets[3].X - 2 + self._widgets[3].margin
-                        self._widgets[i].window = self._win
-                        self._widgets[i].resize()
-                    else:
-                        self._widgets[n].show()
+                        self._widgets[n].move()
+                        # self._widgets[n].resize()
+                    self._widgets[n].show()
         self._win.refresh()
 
         # self._refresh()

pyradio/player.py

@@ -213,11 +213,6 @@ class Player(object):
 
     all_config_files = {}
 
-    ''' the function to call when a station starts to play
-        (playback detected) to add a click to its click counter
-    '''
-    click_station_function = None
-
     def __init__(self,
                  config,
                  outputStream,
@@ -523,10 +518,6 @@ def _stop_delay_thread(self):
                 pass
             self.delay_thread = None
 
-        ''' click station (if applicable) '''
-        if self.click_station_function and self.isPlaying():
-            self.click_station_function()
-
     def _is_in_playback_token(self, a_string):
         for a_token in self._playback_token_tuple:
             if a_token in a_string:

pyradio/radio.py

@@ -1142,18 +1142,11 @@ def playSelection(self, restart=False):
             self.playback_timeout = int(self._cnf.connection_timeout_int)
         except ValueError:
             self.playback_timeout = 10
-        if self._cnf.browsing_station_service and self.playback_timeout == 0:
-            ''' if playback timeout check if disabled,
-                click the station immediately (even if the station
-                may turn out to be broken)
-            '''
-            self._click_station()
+        self._click_station()
 
     def _click_station(self):
         if self._cnf._online_browser:
             self._cnf._online_browser.click(self.playing)
-        else:
-            self.player.click_station_function = None
 
     def playbackTimeoutCounter(self, *args):
         timeout = args[0]
@@ -3026,10 +3019,7 @@ def _open_playlist(self, a_url=None):
                             return
 
                         ''' make sure we don't send a wrong click '''
-                        self.player.click_station_function = None
-                        logger.error('---=== Click function is None ===---')
                         self._cnf._online_browser.search()
-                        self.player.click_station_function = self._click_station
                     else:
                         self._cnf.remove_from_playlist_history()
                         self._print_unknown_browser_service()
@@ -3044,7 +3034,6 @@ def _open_playlist(self, a_url=None):
                 self._cnf.browsing_station_service = False
         elif self._cnf.register_to_open:
             ''' open a register '''
-            self.player.click_station_function = None
             self._playlist_in_editor = self._cnf.register_to_open
             if logger.isEnabledFor(logging.DEBUG):
                 logger.debug('opening register: ' + self._cnf.register_to_open)
@@ -3079,7 +3068,6 @@ def _open_playlist(self, a_url=None):
             #else:
             #    txt = '''Reading playlists. Please wait...'''
             #self._show_help(txt, self.ws.NORMAL_MODE, caption=' ', prompt=' ', is_message=True)
-            self.player.click_station_function = None
             if self.ws.operation_mode != self.ws.PLAYLIST_MODE:
                 self.selections[self.ws.operation_mode] = [self.selection, self.startPos, self.playing, self._cnf.stations]
             self.ws.window_mode = self.ws.PLAYLIST_MODE
@@ -3125,28 +3113,28 @@ def _return_from_online_browser_search(self, ret):
             self._cnf.browsing_station_service = False
             return
 
+        ''' get stations with online field '''
         tmp_stations = self._cnf._online_browser.stations(2)
 
         ''' set browser parent so that it resizes correctly '''
         if self._cnf.browsing_station_service:
             self._cnf._online_browser.parent = self.bodyWin
 
-        if tmp_stations:
-            self._cnf.stations = tmp_stations[:]
-            self.stations = self._cnf.stations
-            self._cnf._online_browser.vote_callback = self._print_vote_result
-            self._cnf.number_of_stations = len(self.stations)
-            self._cnf.dirty_playlist = False
-            #self._cnf.add_to_playlist_history(self._cnf.online_browser.BASE_URL, '', self._cnf.online_browser.TITLE, browsing_station_service=True)
-            self._cnf.station_path = self._cnf.online_browser.BASE_URL
-            self._cnf.station_title = self._cnf.online_browser.title
-            self.number_of_items = len(self.stations)
-            self.selection = 0
-            self.startPos = 0
-            self.setupAndDrawScreen()
-            self.detect_if_player_exited = False
-            self._align_stations_and_refresh(self.ws.operation_mode)
-            self._set_active_stations()
+        self._cnf.stations = tmp_stations[:]
+        self.stations = self._cnf.stations
+        self._cnf._online_browser.vote_callback = self._print_vote_result
+        self._cnf.number_of_stations = len(self.stations)
+        self._cnf.dirty_playlist = False
+        #self._cnf.add_to_playlist_history(self._cnf.online_browser.BASE_URL, '', self._cnf.online_browser.TITLE, browsing_station_service=True)
+        self._cnf.station_path = self._cnf.online_browser.BASE_URL
+        self._cnf.station_title = self._cnf.online_browser.title
+        self.number_of_items = len(self.stations)
+        self.selection = 0
+        self.startPos = 0
+        self.setupAndDrawScreen()
+        self.detect_if_player_exited = False
+        self._align_stations_and_refresh(self.ws.operation_mode)
+        self._set_active_stations()
 
     def _open_playlist_from_history(self,
                                     reset=False,
@@ -3291,7 +3279,6 @@ def _open_playlist_from_history(self,
                     if logger.isEnabledFor(logging.INFO):
                         logger.info('Closing online browser!')
                     self._cnf.online_browser = None
-                    self.player.click_station_function = None
                 ''' check if browsing_station_service has changed '''
                 if not self._cnf.browsing_station_service and \
                         removed_playlist_history_item[-1]:
@@ -5597,7 +5584,6 @@ def keypress(self, char):
                 self.bodyWin.nodelay(False)
                 if char == -1:
                     ''' ESCAPE '''
-                    self.player.click_station_function = None
                     self._update_status_bar_right(status_suffix='')
                     if self.ws.operation_mode == self.ws.PLAYLIST_MODE:
                         ''' return to stations view '''
@@ -6474,6 +6460,12 @@ def _redisplay_stations_and_playlists(self):
                             self.__displayBodyLine(lineNum, pad, None)
                             lineNum += 1
                     break
+        else:
+            ''' we have no stations to display '''
+            if self._cnf.browsing_station_service:
+                ''' we have to display emplty lines '''
+                for n in range(0, self.bodyMaxY + 1):
+                    self.__displayBodyLine(n, pad, None)
 
         if self._cnf.browsing_station_service:
             if self._cnf.internal_header_height > 0:

pyradio/simple_curses_widgets.py

@@ -46,15 +46,15 @@ def Y(self):
 
     @Y.setter
     def Y(self, value):
-        raise ValueError('parameter is read only')
+        self._Y = value
 
     @property
     def X(self):
         return self._X
 
     @X.setter
     def X(self, value):
-        raise ValueError('parameter is read only')
+        self._X = value
 
     @property
     def height(self):
@@ -829,6 +829,7 @@ def __init__(self,
                 Inactive checkbox color (curses.color_pair)
             bracket_color
                 The color of the brackets (curses.color_pair)
+                Also the color to use when widget is disabled
             char
                 The character to indicate a checked checkbox (string)
             checked
@@ -900,6 +901,14 @@ def resize(self):
         self._width = len(self._caption) + 4
         self._win = curses.newwin(1, self._width, self._Y, self._X)
 
+    def move(self, new_Y=None, new_X=None):
+        if new_Y:
+            self._Y = new_Y
+        if new_X:
+            self._X = new_X
+        if self._win:
+            self._win.mvwin(self._Y, self._X)
+
     def show(self):
         '''Put the widget on the screen'''
         if self._win:

pyradio/themes.py

@@ -12,6 +12,13 @@
 
 logger = logging.getLogger(__name__)
 
+def hex_color_to_rgb(a_color_string):
+    return tuple(int(a_color_string[i:i+2], 16) for i in (0, 2, 4))
+
+def hex_color_to_curses_rgb(a_color_string):
+    rgb = hex_color_to_rgb(a_color_string)
+    return tuple(int(round(x * 1000.0 / 255.0)) for x in rgb)
+
 
 class PyRadioTheme(object):
     _colors = {}
@@ -387,15 +394,15 @@ def _get_max_color(self, a_theme_name, max_color):
         for a_check in checks:
             if a_theme_name.endswith(a_check):
                 try:
-                    num_of_colors = int(a_check[1:])
+                    num_of_colors = int(a_check[1:]) - 1
                 except:
                     pass
                 break
         checks = (8, 16, 256)
         if num_of_colors == 0 or num_of_colors not in checks:
             num_of_colors = max_color
             for check in checks:
-                if num_of_colors <= check:
+                if num_of_colors < check:
                     return check
         return num_of_colors