When XDG compliant is force due to both XDG_DATA_HOME and

XDG_STATE_HOME directories already exist, update the local
Desktop file, so that the Icon point to its new location

Author: s-n-g

devel/fix_pyradio_desktop_file

@@ -53,6 +53,10 @@ function get_data_dir(){
         XDG="$(sed 's/[A-Z]/\l&/' "$CFG_FILE" | grep 'xdg_compliant = true')"
     fi
     if [ -z "$XDG" ]
+    then
+        XDG="$(sed 's/[A-Z]/\l&/' "${XDG_CONFIG_HOME-"$HOME"/.config}"/pyradio/config | grep 'xdg_compliant = true')"
+    fi
+    if [ -z "$XDG" ]
     then
         DATA_DIR=~/.config/pyradio/data
     else

pyradio/config.py

@@ -1378,6 +1378,8 @@ class PyRadioConfig(PyRadioStations):
 
     _linux_resource_opener = None
 
+    need_to_fix_desktop_file_icon = False
+
     def __init__(self, user_config_dir=None, headless=False):
         # keep old recording / new recording dir
         self.rec_dirs = ()
@@ -2084,6 +2086,7 @@ def read_config(self, distro_config=False):
         self.xdg.ensure_paths_exist()
 
     def _read_config(self, distro_config=False):
+        xdg_compliant_read_from_file = False
         if distro_config:
             file_to_read = path.join(path.dirname(__file__), 'config')
         else:
@@ -2271,6 +2274,7 @@ def _read_config(self, distro_config=False):
                     not platform.startswith('win') and \
                     sp[1].lower() == 'true':
                 self.xdg_compliant = True
+                xdg_compliant_read_from_file = True
             elif sp[0] == 'resource_opener' and \
                     not (platform.startswith('win') or \
                         platform.startswith('dar')):
@@ -2356,6 +2360,16 @@ def _read_config(self, distro_config=False):
             if path.exists(d_dir) and path.exists(s_dir):
                 print('[magenta]XDG Dirs[/magenta] found; enabling [magenta]XDG Base compliant[/magenta] operation')
                 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] == '':

pyradio/main.py

@@ -375,41 +375,46 @@ def shell():
                 print('Error in config path: "[red]{}[/red]"\n      This directory cannot be used by [magenta]PyRadio[/magenta]!'.format(args.config_dir))
                 sys.exit(1)
 
-    if not system().lower().startswith('darwin') and \
-            not system().lower().startswith('win'):
-        # if args.generate_systemd_service_files:
-        #     create_systemd_service_files()
-        #     sys.exit()
-        # elif args.terminal:
-        if args.terminal:
-            try:
-                from urllib.request import urlretrieve
-            except:
-                from urllib import urlretrieve
-            try:
-                r = urlretrieve('https://raw.githubusercontent.com/coderholic/pyradio/master/devel/fix_pyradio_desktop_file')
-            except:
-                print('Cannot contact github...')
-                sys.exit(1)
-            if int(r[1]['content-length']) < 1000:
-                print('Cannot contact github...')
-                sys.exit(1)
-            script = r[0]
-            # script = '/home/spiros/projects/my-gits/pyradio/devel/fix_pyradio_desktop_file'
-            chmod(script , 0o766)
-            if args.terminal_param:
-                command = 'bash -c "' + script + ' -t ' + args.terminal + " -p '-" + args.terminal_param + "'" + '"'
-                command = 'bash -c "' + script + ' -t ' + args.terminal + " -p '" + args.terminal_param.replace('\\', '') + "'" + '"'
-                # print(command)
-                subprocess.call(command, shell=True)
-            else:
-                subprocess.call('bash -c "' + script + ' -t ' + args.terminal + '"', shell=True)
-            remove(r[0])
-            sys.exit()
-
     with pyradio_config_file(user_config_dir, args.headless) as pyradio_config:
         read_config(pyradio_config)
 
+        if not system().lower().startswith('darwin') and \
+                not system().lower().startswith('win'):
+            # if args.generate_systemd_service_files:
+            #     create_systemd_service_files()
+            #     sys.exit()
+            # elif args.terminal:
+
+            if args.terminal:
+                import subprocess
+                r = None
+                script = None
+                script = '/home/spiros/projects/my-gits/pyradio/devel/fix_pyradio_desktop_file'
+                if script is None:
+                    try:
+                        from urllib.request import urlretrieve
+                    except:
+                        from urllib import urlretrieve
+                    try:
+                        r = urlretrieve('https://raw.githubusercontent.com/coderholic/pyradio/master/devel/fix_pyradio_desktop_file')
+                    except:
+                        print('Cannot contact github...')
+                        sys.exit(1)
+                    if int(r[1]['content-length']) < 1000:
+                        print('Cannot contact github...')
+                        sys.exit(1)
+                    script = r[0]
+                chmod(script , 0o766)
+                if args.terminal_param:
+                    command = 'bash -c "' + script + ' -t ' + args.terminal + " -p '-" + args.terminal_param + "'" + '"'
+                    command = 'bash -c "' + script + ' -t ' + args.terminal + " -p '" + args.terminal_param.replace('\\', '') + "'" + '"'
+                    subprocess.call(command, shell=True)
+                else:
+                    subprocess.call('bash -c "' + script + ' -t ' + args.terminal + '"', shell=True)
+                if r is not None:
+                    remove(r[0])
+                sys.exit()
+
         if args.write_theme:
             if args.write_theme[0]:
                 from .themes import PyRadioTheme

pyradio/xdg.py

@@ -45,6 +45,7 @@ class XdgMigrate(object):
 
     def __init__(self, config=None):
         self.home_dir = path.expanduser('~')
+        self._desktop_file = path.join(self.home_dir, '.local', 'share', 'applications', 'pyradio.desktop')
         self.other_dir = path.join(self.home_dir, 'pyradio-not-migrated')
         if config is None:
             # test values
@@ -56,12 +57,16 @@ def __init__(self, config=None):
             else:
                 self.old_registers_dir = path.join(self.home_dir, '.config', 'pyradio', '.registers')
             self.new_registers_dir = path.join(self.state_dir, 'registers')
+            self._need_to_fix_desktop_file = config.need_to_fix_desktop_file_icon
+            self._icon_location = path.join(self.home_dir, '.config', 'data', 'pyradio.png')
         else:
             self.data_dir = config.data_dir
             self.state_dir = config.state_dir
             self.path_to_scan = config.stations_dir
             self.old_registers_dir = config.xdg._old_dirs[config.xdg.REGISTERS]
             self.new_registers_dir = config.xdg._new_dirs[config.xdg.REGISTERS]
+            self._need_to_fix_desktop_file = True
+            self._icon_location = path.join(config.data_dir, 'pyradio.png')
         self._get_files()
 
     def _print_file(self, an_item, max_length):
@@ -139,6 +144,10 @@ def rename_files(self, to_console=True):
                 '> Nothing to copy to "state" dir',
                 '> Nothing to copy to "pytadio-not-migrated" dir',
             )
+
+        ''' update Deskto file '''
+        self._update_desktop_file()
+
         go_on = False
         move_registers = False
         for n in self.files_to_data, self.files_to_state, self.files_to_other:
@@ -215,6 +224,22 @@ def rename_files(self, to_console=True):
             if to_console and self._verbose:
                 input('Press ENTER to continue... ')
 
+    def _update_desktop_file(self):
+        if path.exists(self._desktop_file) and \
+                self._need_to_fix_desktop_file:
+            try:
+                  with open(self._desktop_file, 'r', encoding='utf-8') as d:
+                      lines = d.readlines()
+            except:
+                return
+            for i, l in enumerate(lines):
+                if l.startswith('Icon='):
+                    sp = l.split('=')
+                    if sp[1].strip() != self._icon_location:
+                        lines[i] = 'Icon=' + self._icon_location + '\n'
+                        with open(self._desktop_file, 'w', encoding='utf-8') as d:
+                            d.writelines(lines)
+
     def _print_error_wit_ask_enter(self):
         print('[red]Error:[/red] moving files to [green]XDG[/green] directories failed...\nCleaning up...')
         self._remove_new_files_on_failure()