rearranging config groups

Author: s-n-g

pyradio/config.py

@@ -1320,35 +1320,35 @@ class PyRadioConfig(PyRadioStations):
     opts['enable_mouse'] = ['Enable mouse support: ', False]
     opts['recording_dir'] = ['Recordings dir: ', '']
     opts['resource_opener'] = ['Resource Opener: ', 'auto']
+    opts['playlist_manngement_title'] = ['Playlist Management Options', '']
+    opts['confirm_station_deletion'] = ['Confirm station deletion: ', True]
+    opts['confirm_playlist_reload'] = ['Confirm playlist reload: ', True]
+    opts['auto_save_playlist'] = ['Auto save playlist: ', False]
+    opts['conn_title'] = ['Connection Options: ', '']
+    opts['connection_timeout'] = ['Connection timeout: ', '10']
+    opts['force_http'] = ['Force http connections: ', False]
     opts['notification'] = ['Notifications', '']
     opts['enable_notifications'] = ['Enable notifications: ', '-1']
     opts['use_station_icon'] = ['    Use station icon: ', True]
     opts['remove_station_icons'] = ['    Remove cached icons: ', True]
     opts['clock_title'] = ['Clock', '']
     opts['enable_clock'] = ['Display on startup: ', False]
     opts['time_format'] = ['Time format: ', '1']
-    opts['conn_title'] = ['Connection Options: ', '']
-    opts['connection_timeout'] = ['Connection timeout: ', '10']
-    opts['force_http'] = ['Force http connections: ', False]
     opts['theme_title'] = ['Theme Options', '']
     opts['theme'] = ['Theme: ', 'dark']
     opts['use_transparency'] = ['Use transparency: ', False]
     opts['force_transparency'] = ['  Force transparency: ', False]
     opts['calculated_color_factor'] = ['Calculated color: ', '0']
     opts['console_theme'] = ['Console theme: ', 'dark']
-    opts['playlist_manngement_title'] = ['Playlist Management Options', '']
-    opts['confirm_station_deletion'] = ['Confirm station deletion: ', True]
-    opts['confirm_playlist_reload'] = ['Confirm playlist reload: ', True]
-    opts['auto_save_playlist'] = ['Auto save playlist: ', False]
     opts['remote'] = ['Remote Control Server', '']
     opts['remote_control_server_ip'] = ['Server IP: ', 'localhost']
     opts['remote_control_server_port'] = ['Server Port: ', '9998']
     opts['remote_control_server_auto_start'] = ['Auto-start Server: ', False]
-    opts['online_header'] = ['Online services', '']
-    opts['radiobrowser'] = ['RadioBrowser', '-']
     opts['shortcuts'] = ['Keyboard Shortcuts', '']
     opts['shortcuts_keys'] = ['Shortcuts', '-']
     opts['localized_keys'] = ['Localized Shortcuts', '-']
+    opts['online_header'] = ['Online services', '']
+    opts['radiobrowser'] = ['RadioBrowser', '-']
     opts['requested_player'] = ['', '']
     opts['dirty_config'] = ['', False]
 

pyradio/config_window.py

@@ -75,26 +75,26 @@ class PyRadioConfigWindow():
     _help_text.append(['If this options is enabled, the mouse can be used to scroll the playlist, start, stop and mute the player, adjust its volume etc.', '|', 'Mouse support is highly terminal dependent, that\'s why it is disabled by default.', '|', 'Default value: False'])
     _help_text.append([ 'This is the folder where recorded files will be saved', '|', 'Tip: When you open the window "h" will display HTML help about this parameter (not in Line Editor).', '|', 'Default value: "pyradio-recordings" in home dir' ])
     _help_text.append(['This is a Linux (et al) only parameter. It has no effect on Windows or MacOS.', '|',
-                       'A Resource Opener is a program used to open files passed to it as arguments. PyRadio will use it to open either directories or HTML files.', '|',
                        'Default value is "auto", in which case, PyRadio will try to use xdg-open, gio, mimeopen, mimeo or handlr, in that order of detection.  If none if found, the requested file will simply not open.'
                        ])
-
-    _help_text.append(None)
-    _help_text.append(['If this options is enabled, a Desktop Notification will be displayed using the notification daemon / service.', '|', 'If enabled but no notification is displayed, please refer to', 'https://github.com/coderholic/pyradio/desktop-notification.md', '|', 'Valid values are:', '   -1: disabled ', '    0: enabled (no repetition) ', '    x: repeat every x seconds ', '|', 'Default value: -1'])
-    _help_text.append(['Notice: Not applicable on Windows!', '|',  'Online Radio Directory Services (like RadioBrowser) will usually provide an icon for the stations they advertise.', '|', 'PyRadio can use this icon (provided that one exists and is of JPG or PNG format) while displaying Desktop Notifications.', '|', 'Setting this option to True, will enable the behavior above.', '|', 'If this option is False, the default icon will be used.', '|', 'Default value: True'])
-    _help_text.append(['Notice: Not applicable on Windows!', '|', 'If the previous option is enabled, Stations Icons will be cached.', '|', 'If this option is set to True, all icons will be deleted at program exit.', '|', 'If set to False, the icons will be available for future use.', '|', 'Default value: True'])
-
-
     _help_text.append(None)
-    _help_text.append(['If this option is enabled, the current time will be displayed at the bottom left corner of the window at program startup.', '|', 'Adjust the time format in the next option to change how the current time is displayed.', '|', r'You can always hide it by pressing \t (default shortcut).', '|', 'Default value: False'])
-    _help_text.append(['This is the time format to be used when the clock is visible.', '|', 'Available values are:', '   0: 24h, with seconds', '   1: 24h, no seconds', '   2: 12h, with am/pm and seconds', '   3: 12h, no am/pm, with seconds', '   4: 12h, with am/pm, no seconds', '   5: 12h, no am/pm, no seconds', '|', 'Default value: 1'])
+    _help_text.append(['Specify whether you will be asked to confirm every station deletion action.', '|', 'Default value: True'])
+    _help_text.append(['Specify whether you will be asked to confirm playlist reloading, when the playlist has not been modified within PyRadio.', '|', 'Default value: True'])
+    _help_text.append(['Specify whether you will be asked to save a modified playlist whenever it needs saving.', '|', 'Default value: False'])
     _help_text.append(None)
     _help_text.append(['PyRadio will wait for this number of seconds to get a station/server message indicating that playback has actually started.', '|',
     'If this does not happen within this number of seconds after the connection is initiated, PyRadio will consider the station unreachable, and display the "Failed to connect to: station" message.', '|', 'Press "h"/Left or "l"/Right to change value.',
     '|', 'Valid values: 5 - 60, 0 disables check', 'Default value: 10'])
     _help_text.append(['Most radio stations use plain old http protocol to broadcast, but some of them use https.', '|', 'If this parameter is enabled, all connections will use http; results depend on the combination of station/player.', '|', 'This value is read at program startup, use "z" to change its effect while mid-session.',
     '|', 'Default value: False'])
     _help_text.append(None)
+    _help_text.append(['If this options is enabled, a Desktop Notification will be displayed using the notification daemon / service.', '|', 'If enabled but no notification is displayed, please refer to', 'https://github.com/coderholic/pyradio/desktop-notification.md', '|', 'Valid values are:', '   -1: disabled ', '    0: enabled (no repetition) ', '    x: repeat every x seconds ', '|', 'Default value: -1'])
+    _help_text.append(['Notice: Not applicable on Windows!', '|',  'Online Radio Directory Services (like RadioBrowser) will usually provide an icon for the stations they advertise.', '|', 'PyRadio can use this icon (provided that one exists and is of JPG or PNG format) while displaying Desktop Notifications.', '|', 'Setting this option to True, will enable the behavior above.', '|', 'If this option is False, the default icon will be used.', '|', 'Default value: True'])
+    _help_text.append(['Notice: Not applicable on Windows!', '|', 'If the previous option is enabled, Stations Icons will be cached.', '|', 'If this option is set to True, all icons will be deleted at program exit.', '|', 'If set to False, the icons will be available for future use.', '|', 'Default value: True'])
+    _help_text.append(None)
+    _help_text.append(['If this option is enabled, the current time will be displayed at the bottom left corner of the window at program startup.', '|', 'Adjust the time format in the next option to change how the current time is displayed.', '|', r'You can always hide it by pressing \t (default shortcut).', '|', 'Default value: False'])
+    _help_text.append(['This is the time format to be used when the clock is visible.', '|', 'Available values are:', '   0: 24h, with seconds', '   1: 24h, no seconds', '   2: 12h, with am/pm and seconds', '   3: 12h, no am/pm, with seconds', '   4: 12h, with am/pm, no seconds', '   5: 12h, no am/pm, no seconds', '|', 'Default value: 1'])
+    _help_text.append(None)
     _help_text.append(['The theme to be used by default.', '|',
     'This is the equivalent to the -t , --theme command line option.', '|',
     'If a theme uses more colors than those supported by the terminal in use, the "dark" theme will be used instead (but the "light" theme will be used, if the "light_16colors" theme was requested but not supported).',
@@ -105,21 +105,15 @@ class PyRadioConfigWindow():
     _help_text.append(['Pyradio can calculate and use an alternative color for secondary windows.', '|', 'This option will determine if this color will be used (value > 0) or not (value = 0), provided that the theme used does not already provide it.', '|', 'The value of this option is actually the factor to darken or lighten the main (stations) background color.', '|', 'Valid Values: 0-0.2', 'Default value: 0'])
     _help_text.append(['The console theme is the one used when PyRadio is executed either from the Linux Virtual Console or the terminal used does not support color changes.', '|', 'This change will take effect after PyRadio is restarted.', '|', 'Default value: dark'])
     _help_text.append(None)
-    _help_text.append(['Specify whether you will be asked to confirm every station deletion action.',
-    '|', 'Default value: True'])
-    _help_text.append(['Specify whether you will be asked to confirm playlist reloading, when the playlist has not been modified within PyRadio.',
-    '|', 'Default value: True'])
-    _help_text.append(['Specify whether you will be asked to save a modified playlist whenever it needs saving.', '|', 'Default value: False'])
-    _help_text.append(None)
     _help_text.append(['This is the IP for the Remote Control Server.', '|', 'Available options:', '- localhost : PyRadio will be accessible from within the current system only.', '- lan : PyRadio will be accessible from any computer in the local network.', '- IP : In case the system has more than one interfaces.', '|', 'Use "Space", "Enter", "l/Right" to change the value.','|', 'Default value: localhost'])
     _help_text.append(
         ['This is the port used by the Remote Control Server (the port the server is listening to).', '|', 'Please make sure that a "free" port is specified here, to avoid any conflicts with existing services and daemons.', '|', 'If an invalid port number is inserted, the cursor will not move to another field.', '|', 'Valid values: 1025-65535', 'Default value: 9998'])
     _help_text.append(['If set to True, the Server will be automatically started when PyRadio starts.', '|', r'If set to False, one can start the Server using the "\s" command from the Main program window.', '|', 'Default value: False'])
     _help_text.append(None)
-    _help_text.append(['This options will open the configuration window for the RadioBrowser Online Stations Directory.',])
-    _help_text.append(None)
     _help_text.append(['This options will open the configuration window for the Shortcuts Definitions.', '|', 'Please keep in mind that if you customize the keyboard shortcuts, the documentation may no longer align with your personalized settings. While the in-program runtime help will always reflect your current key configurations, the static documentation will continue to display the default shortcuts.', '|', 'To ensure you have the best experience, refer to the runtime help for the most accurate information regarding your customized key bindings!'])
     _help_text.append(['The "Localized Shortcuts" option allows you to define and customize keyboard shortcuts based on your preferred language. This feature enhances your experience by providing a seamless way to interact with the program in your chosen language.', '|', 'You can choose a language name from the list to load the corresponding character mapping file. This file contains the relationship between English letters (A-Z, a-z) and the letters used in your selected language.', '|', 'If the language does not exit, you will be able to create it.'])
+    _help_text.append(None)
+    _help_text.append(['This options will open the configuration window for the RadioBrowser Online Stations Directory.',])
 
     _config_options = None
 

pyradio/player.py

@@ -945,7 +945,7 @@ def updateStatus(self, *args):
                         subsystemOut = subsystemOutRaw.decode('utf-8', 'replace')
                 got_404 = False
                 if stop():
-                    rgeak
+                    break
                 elif subsystemOut == '':
                     if logger.isEnabledFor(logging.INFO):
                         logger.info('----==== player crached ====----')