-ep parameter will be active for the session only

-ep "vlc:profile:...." will display error message and exit

Author: s-n-g

README.html

@@ -97,12 +97,13 @@ <h2 id="command-line-options">Command line options <span style="padding-left: 10
                         manager.
   -ep EXTRA_PLAYER_PARAMETERS, --extra-player_parameters EXTRA_PLAYER_PARAMETERS
                         Provide extra player parameters as a string. The
-                        string&#39;s format is [player_name:parameters].
-                        player_name can be &#39;mpv&#39;, &#39;mplayer&#39; or &#39;vlc&#39;.
-                        Alternative format to pass a profile:
-                        [player_name:profile:profile_name]. In this case, the
-                        profile_name must be a valid profile defined in the
-                        player&#39;s config file (not for VLC).
+                        parameter is saved in the configuration file and is
+                        activated for the current session. The string&#39;s format
+                        is [player_name:parameters]. player_name can be &#39;mpv&#39;,
+                        &#39;mplayer&#39; or &#39;vlc&#39;. Alternative format to pass a
+                        profile: [player_name:profile:profile_name]. In this
+                        case, the profile_name must be a valid profile defined
+                        in the player&#39;s config file (not for VLC).
   -ap ACTIVE_PLAYER_PARAM_ID, --active-player-param-id ACTIVE_PLAYER_PARAM_ID
                         Specify the extra player parameter set to be used with
                         the default player. ACTIVE_PLAYER_PARAM_ID is 1-11

README.md

@@ -78,12 +78,13 @@ optional arguments:
                         manager.
   -ep EXTRA_PLAYER_PARAMETERS, --extra-player_parameters EXTRA_PLAYER_PARAMETERS
                         Provide extra player parameters as a string. The
-                        string's format is [player_name:parameters].
-                        player_name can be 'mpv', 'mplayer' or 'vlc'.
-                        Alternative format to pass a profile:
-                        [player_name:profile:profile_name]. In this case, the
-                        profile_name must be a valid profile defined in the
-                        player's config file (not for VLC).
+                        parameter is saved in the configuration file and is
+                        activated for the current session. The string's format
+                        is [player_name:parameters]. player_name can be 'mpv',
+                        'mplayer' or 'vlc'. Alternative format to pass a
+                        profile: [player_name:profile:profile_name]. In this
+                        case, the profile_name must be a valid profile defined
+                        in the player's config file (not for VLC).
   -ap ACTIVE_PLAYER_PARAM_ID, --active-player-param-id ACTIVE_PLAYER_PARAM_ID
                         Specify the extra player parameter set to be used with
                         the default player. ACTIVE_PLAYER_PARAM_ID is 1-11

pyradio/browser.py

@@ -330,7 +330,7 @@ def search(self, data):
             r.raise_for_status()
             logger.error(r.text)
             self._raw_stations = self._extract_data(json.loads(r.text))
-            logger.error('DE {}'.format(self._raw_stations))
+            # logger.error('DE {}'.format(self._raw_stations))
         except requests.exceptions.RequestException as e:
             if logger.isEnabledFor(logging.ERROR):
                 logger.error(e)

pyradio/config.py

@@ -1004,7 +1004,7 @@ class PyRadioConfig(PyRadioStations):
     PROGRAM_UPDATE = None
 
     def __init__(self):
-        self.backup_player_params = [[]]
+        self.backup_player_params = None
         self._profile_name = 'pyradio'
         self.player = ''
         self.requested_player = ''
@@ -1062,36 +1062,46 @@ def command_line_params(self):
     def command_line_params(self, val):
         self.command_line_params_not_ready = None
         if val:
+            if val.startswith('vlc:profile'):
+                if logger.isEnabledFor(logging.ERROR):
+                    logger.error('VLC does not support profiles')
+                self.init_backup_player_params()
+                return
+
             if self.PLAYER_NAME:
                 parts = val.replace('\'', '').replace('"', '').split(':')
                 if len(parts) > 1 and parts[0] in SUPPORTED_PLAYERS:
-                    if self.PLAYER_NAME == 'vlc' and parts[1] == 'profile':
-                        if logger.isEnabledFor(logging.DEBUG):
-                            logger.debug('VLC does not support profiles')
+                    ''' add to params '''
+                    # logger.error('DE \n\n{0}\n{1}'.format(self.saved_params, self.params))
+                    to_add = ':'.join(parts[1:])
+                    if to_add in self.params[parts[0]]:
+                        added_id = self.params[parts[0]].index(to_add)
                     else:
-                        ''' add to params '''
-                        logger.error('DE \n\n{0}\n{1}'.format(self.saved_params, self.params))
-                        self.params[parts[0]].append(':'.join(parts[1:]))
-                        ''' change first params item to point to this new item '''
-                        self.params[parts[0]][0] = len(self.params[parts[0]]) - 1
-                        logger.error('DE \n{0}\n{1}\n\n'.format(self.saved_params, self.params))
-
-                        self.dirty_config = True
-                        if logger.isEnabledFor(logging.DEBUG):
-                            logger.debug(self.params)
-                        print(self.params)
-
-                        if len(parts) > 2:
-                            if parts[1] == 'profile':
-                                ''' Custom profile for player '''
-                                self.command_line_params_not_ready = val
-                                self.set_profile_from_command_line()
+                        self.params[parts[0]].append(to_add)
+                        added_id = len(self.params[parts[0]]) - 1
+                    # logger.error('DE \n{0}\n{1}\n\n'.format(self.saved_params, self.params))
+
+                    self.dirty_config = True
+
+                    if len(parts) > 2:
+                        if parts[1] == 'profile':
+                            ''' Custom profile for player '''
+                            self.command_line_params_not_ready = val
+                            self.set_profile_from_command_line()
+
+                ''' change second backup params item to point to this new item
+                    if the parameter belongs to the player pyradio currently uses
+                '''
+                if parts[0] == self.PLAYER_NAME:
+                    self.init_backup_player_params()
+                    self.backup_player_params[1][0] = added_id
+                    if logger.isEnabledFor(logging.DEBUG):
+                        logger.debug('Setting active parameters: "{}"'.format(self.backup_player_params[1]))
             else:
                 ''' Since we don't know which player we use yet
                     we do not know if this profile has to be
                     applied. So set evaluate for later...
                 '''
-                print('Will check command line parameters later...({})'.format(val))
                 self.command_line_params_not_ready = val
 
     @property
@@ -1521,7 +1531,6 @@ def save_config(self):
                  0: Config saved successfully
                  1: Config not saved (not modified)
                  TODO: 2: Config not saved (session locked) '''
-        logger.error('DE buckup_params = {}'.format(self.backup_player_params))
         if self.locked:
             if logger.isEnabledFor(logging.INFO):
                 logger.info('Config not saved (session locked)')
@@ -1720,8 +1729,6 @@ def save_config(self):
             logger.info('Config saved')
         self.dirty_config = False
         self.params_changed = False
-        # Do not touch the active value
-        # self.init_backup_player_params()
         return 0
 
     def read_playlist_file(self, stationFile='', is_register=False):

pyradio/main.py

@@ -81,7 +81,7 @@ def shell():
     parser.add_argument('-ocd', '--open-config-dir', action='store_true',
                         help='Open config directory [CONFIG DIR] with default file manager.')
     parser.add_argument('-ep', '--extra-player_parameters', default=None,
-                        help="Provide extra player parameters as a string. The string\'s format is [player_name:parameters]. player_name can be 'mpv', 'mplayer' or 'vlc'. Alternative format to pass a profile: [player_name:profile:profile_name]. In this case, the profile_name must be a valid profile defined in the player\'s config file (not for VLC).")
+                        help="Provide extra player parameters as a string. The parameter is saved in the configuration file and is activated for the current session. The string\'s format is [player_name:parameters]. player_name can be 'mpv', 'mplayer' or 'vlc'. Alternative format to pass a profile: [player_name:profile:profile_name]. In this case, the profile_name must be a valid profile defined in the player\'s config file (not for VLC).")
     parser.add_argument('-ap', '--active-player-param-id', default=0, help='Specify the extra player parameter set to be used with the default player. ACTIVE_PLAYER_PARAM_ID is 1-11 (refer to the output of the -lp option)')
     parser.add_argument('-lp', '--list-player-parameters', default=None,
                         action='store_true',
@@ -140,11 +140,21 @@ def shell():
                 print('')
             sys.exit()
 
-
         ''' extra player parameters '''
         if args.extra_player_parameters:
             if ':' in args.extra_player_parameters:
-                pyradio_config.command_line_params = args.extra_player_parameters
+                if pyradio_config.locked:
+                    print('Error: This session is locked!')
+                    print('       Please exist any other instances of the program')
+                    print('       that are currently running and try again.')
+                    sys.exit(1)
+                else:
+                    if args.extra_player_parameters.startswith('vlc:profile'):
+                        print('Error in parameter: "-ep".')
+                        print('  VLC does not supports profiles\n')
+                        sys.exit()
+                    else:
+                        pyradio_config.command_line_params = args.extra_player_parameters
             else:
                 print('Error in parameter: "-ep".')
                 print('  Parameter format: "player_name:parameters"')

pyradio/player.py

@@ -190,19 +190,13 @@ def __init__(self,
 
         self.config_files = []
         self._get_all_config_files()
-        if self._cnf.command_line_params_not_ready is not None:
-            self._cnf.command_line_params = self._cnf.command_line_params_not_ready
-            if logger.isEnabledFor(logging.DEBUG):
-                logger.debug('Setting command line parameters to: "{0}" <- "{1}"'.format(self._cnf.command_line_params, self._cnf.command_line_params_not_ready))
-
         #if self.WIN and self.PLAYER_NAME == 'vlc':
         if platform == 'win32':
             ''' delete old vlc files (vlc_log.*) '''
             from .del_vlc_log import RemoveWinVlcLogFiles
             threading.Thread(target=RemoveWinVlcLogFiles(self.config_dir)).start()
 
     def _get_all_config_files(self):
-
         ''' MPV config files '''
         config_files = []
         config_files = [expanduser("~") + "/.config/mpv/mpv.conf"]

pyradio/radio.py

@@ -509,18 +509,17 @@ def setup(self, stdscr):
                     self.playbackTimeoutCounter,
                     self.connectionFailed,
                     self._show_station_info_from_thread)
-            self._cnf.init_backup_player_params()
-
-            ''' activate user specified player parameter set '''
-            if self._cnf.user_param_id > 0:
-                if self.set_param_set_by_id(self._cnf.user_param_id):
-                    self._cnf.user_param_id = 0
-                else:
-                    self._cnf.user_param_id = -1
         except:
             ''' no player '''
             self.ws.operation_mode = self.ws.NO_PLAYER_ERROR_MODE
 
+        if self.ws.operation_mode != self.ws.NO_PLAYER_ERROR_MODE:
+            if self._cnf.command_line_params_not_ready is not None:
+                self._cnf.command_line_params = self._cnf.command_line_params_not_ready
+            else:
+                if self._cnf.backup_player_params is None:
+                    self._cnf.init_backup_player_params()
+
         self.stdscr.nodelay(0)
         self.setupAndDrawScreen(init_from_setup=True)
 
@@ -4190,8 +4189,6 @@ def keypress(self, char):
                                 self.player.threadUpdateTitle()
                         else:
                             self.log.write(msg=msg[1], help_msg=True, suffix=self._status_suffix)
-                        # Do not touch the active value
-                        # self._cnf.init_backup_player_params()
                         self._old_config_encoding = self._cnf.opts['default_encoding'][1]
                         # Do not update the active force_http
                         # self.player.force_http = self._cnf.opts['force_http'][1]