Implementing global functions for RadioBrowser Config Windows

Author: s-n-g

pyradio/browser.py

@@ -395,6 +395,15 @@ def add_to_title(self):
     def _get_title(self):
         self.TITLE = 'RadioBrowser ({})'.format(country_from_server(self._server))
 
+    def set_global_functions(self, global_functions):
+        self._global_functions = {}
+        if global_functions is not None:
+            self._global_functions = dict(global_functions)
+            if 't' in self._global_functions.keys():
+                del self._global_functions['t']
+            if 'T' in self._global_functions.keys():
+                del self._global_functions['T']
+
     def stations(self, playlist_format=1):
         ''' Return stations' list (in PyRadio playlist format)
 
@@ -1414,7 +1423,8 @@ def show_config(self, parent=None, init=False):
                 current_limit=self._default_max_number_of_results,
                 current_ping_count=self._default_ping_count,
                 current_ping_timeout=self._default_ping_timeout,
-                init=init
+                init=init,
+                global_functions=self._global_functions
             )
         self.keyboard_handler = self._config_win
         self._config_win.show(parent=parent)
@@ -1654,7 +1664,8 @@ def __init__(
             current_limit=100,
             init=False,
             stations_dir=None,
-            distro=None
+            distro=None,
+            global_functions=None
     ):
         ''' Parameters
                 0: working
@@ -1697,6 +1708,11 @@ def __init__(
                                       current_history_id,
                                       current_history
                                       )
+        self._global_functions = {}
+        if global_functions is not None:
+            self._global_functions = global_functions.copy()
+            if 't' in self._global_functions.keys():
+                del self._global_functions['t']
 
     @property
     def urls(self):
@@ -2121,6 +2137,9 @@ def keypress(self, char):
                 logger.error('---=== Server Selection is None ===---')
                 self._server_selection_window = None
 
+        if chr(char) in self._global_functions.keys():
+            self._global_functions[chr(char)]()
+            return 1
         if char in (
             curses.KEY_EXIT, 27, ord('q')
         ):

pyradio/radio.py

@@ -1587,7 +1587,7 @@ def _show_theme_selector(self, changed_from_config=False):
             #'/home/spiros/edit.log')
         self._theme_selector.changed_from_config = changed_from_config
         self._theme_selector.show()
-        self._theme_selector.set_global_gunctions(self._global_functions)
+        self._theme_selector.set_global_functions(self._global_functions)
 
     def _get_message_width_from_list(self, lines):
         mwidth = 0
@@ -3473,6 +3473,7 @@ def _open_playlist(self, a_url=None):
                         pass
                     # logger.error('DE online browser = {}'.format(self._cnf._online_browser))
                     if self._cnf.online_browser:
+                        self._cnf.online_browser.set_global_functions(self._global_functions)
                         tmp_stations = []
 
                         if not self._cnf._online_browser.initialize():
@@ -4660,7 +4661,8 @@ def _browser_init_config(self, parent=None, init=False, browser_name=None, distr
                     parent=parent,
                     stations_dir=self._cnf.stations_dir,
                     init=init,
-                    distro=distro
+                    distro=distro,
+                    global_functions=self._global_functions
                 )
                 self.ws.close_window()
             # if title:
@@ -5764,8 +5766,7 @@ def keypress(self, char):
                     self.refreshBody()
             return
 
-        elif self.ws.operation_mode == self.ws.RADIO_BROWSER_CONFIG_MODE and \
-                char not in self._chars_to_bypass_on_editor:
+        elif self.ws.operation_mode == self.ws.RADIO_BROWSER_CONFIG_MODE:
             ''' handle browser config '''
             if self._cnf._online_browser:
                 ret = self._cnf._online_browser.keypress(char)

pyradio/themes.py

@@ -468,13 +468,13 @@ def __init__(self, parent, config, theme,
 
         self._themes = []
 
-    def set_global_gunctions(self, global_functions):
+    def set_global_functions(self, global_functions):
         self._global_functions = {}
         if global_functions is not None:
             self._global_functions = dict(global_functions)
             if 't' in self._global_functions.keys():
                 del self._global_functions['t']
-            if self.changed_from_config:
+            if 'T' in self._global_functions.keys():
                 del self._global_functions['T']
 
     def show(self):