- detecting forced XDG compliance will not alter the configuration

  file, just check for XDG_DATA_HOME and XDG_STATE_HOME
- fixing typos

Author: s-n-g

devel/fix_pyradio_desktop_file

@@ -46,6 +46,8 @@ the terminal \"my_term\" is \"-S\", execute as follows:
 }
 
 function get_data_dir(){
+    local CHK_XDG_DATA_DIR
+    local CHK_XDG_STATE_DIR
     SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
     CFG_FILE=$(dirname $"$SCRIPT_DIR")"/pyradio/config"
     if [ -e "$CFG_FILE" ]
@@ -54,14 +56,18 @@ function get_data_dir(){
     fi
     if [ -z "$XDG" ]
     then
-        XDG="$(sed 's/[A-Z]/\l&/' "${XDG_CONFIG_HOME-"$HOME"/.config}"/pyradio/config | grep 'xdg_compliant = true')"
+        CHK_XDG_DATA_DIR=${XDG_DATA_HOME-"$HOME"/.local/share/pyradio}
+        CHK_XDG_STATE_DIR=${XDG_DATA_HOME-"$HOME"/.local/state/pyradio}
+        if [ -e ${CHK_XDG_DATA_DIR} ] && [ -e "${CHK_XDG_STATE_DIR}" ]
+        then
+            XDG=true
+        fi
     fi
     if [ -z "$XDG" ]
     then
         DATA_DIR=~/.config/pyradio/data
     else
-        DATA_DIR="$XDG_DATA_HOME"
-        [ -z "$DATA_DIR" ] && DATA_DIR=~/.local/share/pyradio
+        DATA_DIR="${XDG_DATA_HOME-"$HOME"/.local/share/pyradio}"
     fi
     mkdir -p "$DATA_DIR" 2>/dev/null
 }

pyradio/config.py

@@ -2362,15 +2362,6 @@ def _read_config(self, distro_config=False):
                 self.xdg_compliant = True
                 self.need_to_fix_desktop_file_icon = True
 
-        if self.need_to_fix_desktop_file_icon and \
-                not distro_config and \
-                not xdg_compliant_read_from_file:
-            with open(file_to_read, 'a', encoding='utf-8') as f:
-                f.write('\n')
-                f.write('# Both XDG_DATA_HOME and XDG_STATE_HOME exist\n')
-                f.write('# This will only be read by fix_pyradio_desktop_file\n')
-                f.write('xdg_compliant = True')
-
     def _make_sure_dirs_exist(self):
         if self.opts['recording_dir'][1] == '':
             self.opts['recording_dir'][1] = path.join(path.expanduser('~'), 'pyradio-recordings')

pyradio/config_window.py

@@ -52,10 +52,10 @@ class PyRadioConfigWindow(object):
     _help_text = []
     _help_text.append(None)
     _help_text.append(['Specify the player to use with PyRadio, or the player detection order.', '|',
-    'This is the eqivelant to the -u , --use-player command line option.', '|',
+    'This is the equivalent to the -u , --use-player command line option.', '|',
     'Example:', '  player = vlc', 'or', '  player = vlc,mpv, mplayer', '|',
     'Default value: mpv,mplayer,vlc'])
-    _help_text.append([r'If this option is enabled, the last local playlist loaded before terminating, will be automatically opened the next time PyRadio is executed. Furthermore, playback will resume, if it was on when PyRadio exited. Otherwise, station selection will be restored.', '|', 'This option will take precedence over the "Def. playlist" configuration option and the "-s" command line option.', '|', 'It can also be toggled on the fly by perssing \l while on Main mode.', '|', 'Default value: False'])
+    _help_text.append([r'If this option is enabled, the last local playlist loaded before terminating, will be automatically opened the next time PyRadio is executed. Furthermore, playback will resume, if it was on when PyRadio exited. Otherwise, station selection will be restored.', '|', 'This option will take precedence over the "Def. playlist" configuration option and the "-s" command line option.', '|', 'It can also be toggled on the fly by pressing \l while on Main mode.', '|', 'Default value: False'])
     _help_text.append(['This is the playlist to open at start up, if none is specified and "Open last playlist" is not set.', '|',
     'This is the equivalent to the -s, --stations command line option.', '|',
     'Default value: stations'])
@@ -87,7 +87,7 @@ class PyRadioConfigWindow(object):
     _help_text.append(['This option will work when a theme\'s transparency value is set to 2 (Obey config setting), the default. Otherwise, it\'s up to the theme to handle transparency.', '|', 'If False, theme colors will be used.', '|',
     "If True and a compositor is running, the stations' window background will be transparent.", '|', "If True and a compositor is not running, the terminal's background color will be used.", '|', 'Default value: False'])
     _help_text.append(['This option, when enabled, will make all themes behave as if their transparency setting was set to 2 (Obey config setting), in which case the windows\'s transparency will depend entirely on the value of the "Use transparency" setting (the option above this one).', '|', 'Default value: False'])
-    _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.', '|', 'You can get more info on this at https://github.com/coderholic/pyradio#secondary-windows-background', '|', 'Valid Values: 0-0.2', 'Default value: 0'])
+    _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.',
@@ -99,9 +99,9 @@ class PyRadioConfigWindow(object):
     _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 wiil 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(['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.', '|', "In order to use RadioBrowser, python's requests module must be installed."])
+    _help_text.append(['This options will open the configuration window for the RadioBrowser Online Stations Directory.',])
 
     _config_options = None
 

pyradio/main.py

@@ -389,7 +389,7 @@ def shell():
                 import subprocess
                 r = None
                 script = None
-                 #script = '/home/spiros/projects/my-gits/pyradio/devel/fix_pyradio_desktop_file'
+                # script = '/home/spiros/projects/my-gits/pyradio/devel/fix_pyradio_desktop_file'
                 if script is None:
                     try:
                         from urllib.request import urlretrieve