- More on global functions implementation

- Updating docs

Author: s-n-g

devel/pre-commit

@@ -113,8 +113,8 @@ do
             -e 's/<.sup>P/^P/' \
             -e 's|N<strong>, </strong>\^P|N</strong>, <strong>^P|' \
             -e 's|<sup>X<strong>|^X</strong>|' \
-            -e 's|<.strong>w<strong>|<strong>w</strong>|' \
-            -e 's|<.strong><.sup>W<.strong>|<strong>^W</strong>|' \
+            -e 's|<.strong>e<strong>|<strong>e</strong>|' \
+            -e 's|<.strong><.sup>E<.strong>|<strong>^E</strong>|' \
             "$out"
     fi
     #sed -i "/^alt=/d" ${out}

pyradio/browser.py

@@ -1231,7 +1231,7 @@ def get_internal_header(self, pad, width):
                 highlight = -1
         return highlight, ((title, columns_separotors, columns[self._output_format]), )
 
-    def select_servers(self, with_config=False, return_function=None, init=False):
+    def select_servers(self, with_config=False, return_function=None, init=False, global_functions=None):
         ''' RadioBrowser select servers '''
         if init:
             self._server_selection_window = None
@@ -1246,15 +1246,18 @@ def select_servers(self, with_config=False, return_function=None, init=False):
                     self._config_win._params[0]['ping_timeout'],
                     Y=11, X=19,
                     show_random=True,
-                    return_function=return_function)
+                    return_function=return_function,
+                    global_functions=global_functions
+                )
             else:
                 self._server_selection_window = RadioBrowserServersSelect(
                     self.parent,
                     self._dns_info.server_urls,
                     self._server,
                     self._default_ping_count,
                     self._default_ping_timeout,
-                    return_function=return_function
+                    return_function=return_function,
+                    global_functions=global_functions
                 )
         else:
             self._server_selection_window.set_parent(self.parent)
@@ -2043,7 +2046,7 @@ def save_config(self):
         ''' config not modified '''
         return -4
 
-    def select_servers(self, with_config=False, return_function=None, init=False):
+    def select_servers(self, with_config=False, return_function=None, init=False, global_functions=None):
         ''' RadioBrowserConfigWindow select servers '''
         if init:
             self._server_selection_window = None
@@ -2056,7 +2059,9 @@ def select_servers(self, with_config=False, return_function=None, init=False):
                 self._params[0]['ping_timeout'],
                 Y=11, X=19,
                 show_random=True,
-                return_function=return_function)
+                return_function=return_function,
+                global_functions=global_functions
+            )
         else:
             self._server_selection_window.set_parent(self._win)
         # self.keyboard_handler = self._server_selection_window
@@ -3814,7 +3819,8 @@ def __init__(self,
                  Y=None,
                  X=None,
                  show_random=False,
-                 return_function=None):
+                 return_function=None,
+                 global_functions=None):
         ''' Server selection Window
             if Y and X are valid (not None)
               keypress just returns 0
@@ -3830,7 +3836,7 @@ def __init__(self,
         self._return_function = return_function
 
         self.servers = RadioBrowserServers(
-            parent, servers, current_server, show_random
+            parent, servers, current_server, show_random, global_functions
         )
         self.maxY = self.servers.maxY + 2
         self.maxX = self.servers.maxX + 2
@@ -3954,7 +3960,7 @@ class RadioBrowserServers(object):
     _too_small = False
     from_config = False
 
-    def __init__(self, parent, servers, current_server, show_random=False):
+    def __init__(self, parent, servers, current_server, show_random=False, global_functions=None):
         self._parent = parent
         self.items = list(servers)
         self.server = current_server
@@ -3973,6 +3979,12 @@ def __init__(self, parent, servers, current_server, show_random=False):
                 self.items[i] = self.items[i].replace('(', ' ' * (s_max - len(self.items[i])) + '(')
         self.maxY = len(self.items)
         self.maxX = len(self.items[0])
+        self._global_functions = {}
+        # if global_functions is not None:
+        #     logger.error('\n\n{}\n\n'.format(global_functions))
+        #     self._global_functions = deepcopy(global_functions)
+        #     if 't' in self._global_functions.keys():
+        #             del self._global_functions['t']
 
         if show_random:
             self.items.reverse()
@@ -4032,7 +4044,10 @@ def keypress(self, char):
         if self._too_small:
             return 1
 
-        if char in (
+        if chr(char) in self._global_functions.keys():
+            self._global_functions[chr(char)]()
+            return 1
+        elif char in (
             curses.KEY_EXIT, ord('q'), 27,
             ord('h'), curses.KEY_LEFT
         ):

pyradio/config_window.py

@@ -560,7 +560,6 @@ def set_parrent(self, window):
         self._redisplay()
 
     def _redisplay(self):
-        logger.error('_redisplay()')
         pY, pX = self._parent.getmaxyx()
         logger.error('pY = {0}, pX = {1}'.format(pY, pX))
         if pY < self._max_lines + 2 or pX < 30:
@@ -595,7 +594,6 @@ def _redisplay(self):
             )
 
     def show(self):
-        logger.error('show()')
         self._win.bkgdset(' ', curses.color_pair(3))
         self._win.erase()
         self._win.box()