- fixing adding parameter

- fixing mpv parameter which might throw a warning
  which would break th TUI
- changing parameters comment in config

Author: s-n-g

pyradio/config.py

@@ -2470,17 +2470,9 @@ def save_config(self, from_command_line=False):
                         if first_param:
                             txt = '''# Player Extra parameters section
 #
-# Each supported player can have up to 9 entries in this section,
-# specifying extra parameters to be used when it is executed.
+# Each supported player can have any number of entries in this
+# section, specifying extra parameters to be used when it is executed.
 # The format is "[player name]_parameter=[parameters]"
-# The parameter part can either be:
-# 1) "profile:[name of profile]" or 2) [prayer parameters]
-# When (1) is used, the [name of profile] should exist in the
-# player's config file (otherwise it will be created).
-# The use of profiles will be silently ignored for VLC, which
-# does not support profiles.
-# When (2) is used, the parameters are added to those specified
-# at PyRadio's default profile (again not for VLC).
 # An asterisk will indicate the parameter to be used as default.
 
 # {} extra parameters\n'''

pyradio/config_window.py

@@ -1446,6 +1446,14 @@ def params(self):
     def params(self, val):
         raise ValueError('parameter is read only')
 
+    def edit_item(self, an_item_id, an_item, select=False):
+        if self._list:
+            self._list.edit_item(an_item_id, an_item, select)
+
+    def add_item(self, an_item, select=False):
+        if self._list:
+            self._list.add_item(an_item, select)
+
     def _validate_add_entry(self, index, item):
         return False if item.startswith('profile:') else True
 
@@ -1725,6 +1733,7 @@ def refresh_win(self, do_show=True):
                     entry_cannot_be_edited_function=self._entry_cannot_be_edited_function,
                     entry_cannot_be_deleted_function=self._entry_cannot_be_deleted_function,
                     on_select_callback_function=self._on_default_parameter_change,
+                    items_changed_function=self._update_items_dict,
                     )
             self._list.focused = not self.from_config
         self._win.refresh()
@@ -1751,12 +1760,7 @@ def set_player(self, a_player, from_keypress=False):
             logger.error('\n>>>==========')
             # logger.error('self._selections = {}'.format(self._selections))
             if self._list and from_keypress:
-                self._selections[self._player] = [
-                        self._list.selection,
-                        self._list.startPos,
-                        self._list.active
-                        ]
-                self._items_dict[self._player] = self._list.items[:]
+                self._update_items_dict()
             self._orig_player = self._player
             self._player = a_player
             self._items = self._items_dict[a_player]
@@ -1817,11 +1821,27 @@ def _go_down(self, how_much=1):
                     self.selection = len(self._items) - 1
         self.refresh_win()
 
+    def _update_items_dict(self):
+        ''' pass _list content to self._items_dict '''
+        if self._list is not None:
+            self._selections[self._player] = [
+                    self._list.selection,
+                    self._list.startPos,
+                    self._list.active
+                    ]
+            self._items_dict[self._player] = self._list.items[:]
+            if logger.isEnabledFor(logging.DEBUG):
+                logger.debug('self._selections\n{0}\nself._items_dic\n{1}'.format(self._selections, self._items_dict))
+
     def save_results(self):
         ''' pass working parameters to original parameters
             effectively saving any changes.
         '''
+        if self._list:
+            self._update_items_dict()
+        # logger.error('\n\n')
         # logger.error('DE save_results')
+        # logger.error('DE self._player = {}'.format(self._player))
         # logger.error('DE 1 working_params = {}'.format(self._working_params))
         self._list_to_dict()
         # logger.error('DE 2 working_params = {}'.format(self._working_params))
@@ -2226,13 +2246,14 @@ def keypress(self, char):
                 if self._parameter_editor.edit_string:
                     if self.editing == 1:
                         ''' add parameter  '''
-                        self._extra._items.append(self._parameter_editor.edit_string)
-                        self._extra.selection = len(self._extra._items) - 1
+                        self._extra.add_item(self._parameter_editor.edit_string, select=True)
+                        # self._extra._items.append(self._parameter_editor.edit_string)
+                        # self._extra.selection = len(self._extra._items) - 1
                         if logger.isEnabledFor(logging.DEBUG):
                             logger.debug('New parameter: ' + self._extra._items[-1])
                     else:
                         ''' change parameter '''
-                        self._extra._items[self._extra.selection] = self._parameter_editor.edit_string
+                        self._extra.edit_item(self._extra.selection, self._parameter_editor.edit_string)
                         if logger.isEnabledFor(logging.DEBUG):
                             logger.debug('New parameter value: ' + self._parameter_editor.edit_string)
 

pyradio/player.py

@@ -2298,7 +2298,7 @@ def _buildStartOpts(self, streamUrl, playList=False):
         ''' Builds the options to pass to mpv subprocess.'''
 
         ''' Test for newer MPV versions as it supports different IPC flags. '''
-        p = subprocess.Popen([self.PLAYER_CMD, '--no-video',  '--input-ipc-server'], stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=False)
+        p = subprocess.Popen([self.PLAYER_CMD, '--no-video',  '--input-ipc-server=' + self.mpvsocket], stdout=subprocess.PIPE, stdin=subprocess.PIPE, shell=False)
         out = p.communicate()
         if 'not found' not in str(out[0]):
             if logger.isEnabledFor(logging.DEBUG):

pyradio/simple_curses_widgets.py

@@ -1838,7 +1838,8 @@ def __init__(self,
                  can_delete_items=False,
                  validate_delete_entry=None,
                  entry_cannot_be_deleted_function=None,
-                 external_keypress_function=None
+                 external_keypress_function=None,
+                 items_changed_function=None
                  ):
         ''' Initialize the widget.
 
@@ -1968,6 +1969,9 @@ def __init__(self,
                    -1 - Cancel
                     1 - Continue
                     2 - Display help
+            items_changed_function
+                A function to execute when items have changed
+                (after adding, editing, deleting)
         '''
         self._focused = self._enabled = True
         self._bordered = bordered
@@ -2032,6 +2036,7 @@ def __init__(self,
         self._entry_cannot_be_added_function = entry_cannot_be_added_function
         self._entry_cannot_be_edited_function = entry_cannot_be_edited_function
         self._entry_cannot_be_deleted_function = entry_cannot_be_deleted_function
+        self._items_changed_function = items_changed_function
         self._selection = selection
         if global_functions is not None:
             self._global_functions = global_functions
@@ -2117,14 +2122,15 @@ def active(self, value):
     @property
     def selection(self):
         '''Returns the widget's max_height '''
+        logger.error('=-=-=- selection = {}'.format(self._selection))
         return self._selection
 
     @selection.setter
     def selection(self, value):
         if 0 <= value < len(self._items):
             self._set_selection(value)
-        else:
-            raise ValueError('selection out of bounds!')
+        # else:
+        #     raise ValueError('selection out of bounds!')
 
     @property
     def startPos(self):
@@ -2348,6 +2354,21 @@ def set_items(
                 self._captions = []
             self._showed = False
         self._scroll = True if len(self._items) > self._body_maxY else False
+        # if self._items_changed_function:
+        #     self._items_changed_function()
+
+    def edit_item(self, an_item_id, an_item, select=False):
+        ''' Edit an item of the list
+            Tip: to be used from the return of the
+                 add_item_function implementation
+                 after enabling can_add_items
+        '''
+        if 0 <= an_item_id < len(self._items):
+            self._items[an_item_id] = an_item
+            if select:
+                self._set_selection(an_item_id)
+            if self._items_changed_function:
+                self._items_changed_function()
 
     def add_item(self, an_item, select=False):
         ''' Add an item to the list
@@ -2358,16 +2379,8 @@ def add_item(self, an_item, select=False):
         self._items.append(an_item)
         if select:
             self._set_selection(len(self._items) - 1)
-
-    def edit_item(self, index, an_item, select=False):
-        ''' Edit an item
-            Tip: to be used from the return of the
-                 edit_item_function implementation
-                 after enabling can_edit_items
-        '''
-        self._items[index] = an_item
-        if select:
-            self._set_selection(len(index) - 1)
+        if self._items_changed_function:
+            self._items_changed_function()
 
     def show(self, parent=None):
         ''' show the widget
@@ -2600,6 +2613,8 @@ def delete_item(self, index):
         else:
             self._toggle_selected_item()
 
+        if self._items_changed_function:
+            self._items_changed_function()
         return len(self._items)
 
     def _toggle_selected_item(self):
@@ -2924,6 +2939,7 @@ def keypress(self, char):
 
             if not self._toggle_selected_item():
                 self._refresh()
+            logger.error('j selection = {}'.format(self._selection))
 
         elif char in self._local_functions.keys():
             self._local_functions(char)