- Fixing player_params_file and schedule_file when XDG compliance is ON

- Updating docs broken links

Author: s-n-g

README.md

@@ -184,7 +184,7 @@ Finally, include the file produced in your report.
 
 ## Packaging PyRadio
 
-If you are a packager and would like to produce a package for your distribution please do follow [this mini guide](docs/packagers-info.md).
+If you are a packager and would like to produce a package for your distribution please do follow [this mini guide](docs/packaging.md).
 
 ## TODO
 

docs/packaging.html

@@ -123,7 +123,7 @@ <h3 id="pyradio__pycache__">pyradio/__pycache__</h3>
 <h2 id="recordings-directory">Recordings Directory <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <p>Parameter <strong>recording_dir</strong> in the config will point to the directory to save recorded files.</p>
 <p>It may seem like a good idea to change it to something meaningful but there is a catch.</p>
-<p><strong>PyRadio 0.9.3</strong> (and newer) will nornaly use the <em>default</em> location, which is <em><sub>/pyradio-recordings<em>. Furthermore, it will move the pre-0.9.3 default recordings dir (~/.config/pyradio/recordings) and titles log (from </em></sub>/.config/pyradio</em>) to this new default location.</p>
+<p><strong>PyRadio 0.9.3</strong> (and newer) will nornaly use the <em>default</em> location, which is <em><sub>/pyradio-recordings<em>. Furthermore, it will move the pre-0.9.3 default recordings dir, i.e. </em></sub>/.config/pyradio/recordings</em> and titles log(from <em>~/.config/pyradio</em>, to this new default location.</p>
 <p>If you, the packager, provide a different default <strong>recording_dir</strong> in the package config file, your users will probably end up in the following situation:</p>
 <ol type="1">
 <li><p>Pro existing recordings and titles logs will end up in <em>~/pyradio-recordings</em>.</p></li>

docs/packaging.md

@@ -133,7 +133,7 @@ Parameter **recording_dir** in the config will point to the directory to save re
 
 It may seem like a good idea to change it to something meaningful but there is a catch.
 
-**PyRadio 0.9.3** (and newer) will nornaly use the *default* location, which is *~/pyradio-recordings*. Furthermore, it will move the pre-0.9.3 default recordings dir (~/.config/pyradio/recordings) and titles log (from *~/.config/pyradio*) to this new default location.
+**PyRadio 0.9.3** (and newer) will nornaly use the *default* location, which is *~/pyradio-recordings*. Furthermore, it will move the pre-0.9.3 default recordings dir, i.e. *~/.config/pyradio/recordings* and titles log(from *~/.config/pyradio*, to this new default location.
 
 If you, the packager, provide a different default **recording_dir** in the package config file, your users will probably end up in the following situation:
 

pyradio/config.py

@@ -179,8 +179,6 @@ def __init__(self, stationFile='', user_config_dir=None):
             self.xdg.build_paths()
         self.xdg.ensure_paths_exist()
         self.root_path = path.join(path.dirname(__file__), 'stations.csv')
-        self.player_params_file = path.join(self.data_dir, 'player-params.json')
-        self.schedule_file = path.join(self.data_dir, 'schedule.json')
         self.themes_dir = path.join(self.stations_dir, 'themes')
         self.favorites_path = path.join(self.stations_dir, 'favorites.csv')
         try:
@@ -2393,6 +2391,22 @@ def _read_config(self, distro_config=False):
             self.opts['dirty_config'][1] = True
 
         self._make_sure_dirs_exist()
+        ''' detect previous XDG Base installation '''
+        if not platform.startswith('win')  and \
+                self._user_config_dir is None and \
+                not self.xdg_compliant and \
+                distro_config:
+            # d_dir = path.join(XdgDirs.get_xdg_dir('XDG_DATA_HOME'), 'pyradio')
+            # s_dir = path.join(XdgDirs.get_xdg_dir('XDG_STATE_HOME'), 'pyradio')
+            d_dir = XdgDirs.get_xdg_dir('XDG_DATA_HOME')
+            s_dir = XdgDirs.get_xdg_dir('XDG_STATE_HOME')
+            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
+
+        # do this here to get proper extra parameters config filepath if XDG is on
+        self.player_params_file = path.join(self.data_dir, 'player-params.json')
         if not distro_config:
             if path.exists(self.player_params_file + '.restore'):
                 try:
@@ -2406,20 +2420,11 @@ def _read_config(self, distro_config=False):
                 except:
                     pass
             self._first_read = False
+            logger.error('\n\nfile = {0}\nplayer extra params = {1}\n\n'.format(self.player_params_file, self.params))
+
+        # do this here to get proper schedule config filepath if XDG is on
+        self.schedule_file = path.join(self.data_dir, 'schedule.json')
 
-        ''' detect previous XDG Base installation '''
-        if not platform.startswith('win')  and \
-                self._user_config_dir is None and \
-                not self.xdg_compliant and \
-                distro_config:
-            # d_dir = path.join(XdgDirs.get_xdg_dir('XDG_DATA_HOME'), 'pyradio')
-            # s_dir = path.join(XdgDirs.get_xdg_dir('XDG_STATE_HOME'), 'pyradio')
-            d_dir = XdgDirs.get_xdg_dir('XDG_DATA_HOME')
-            s_dir = XdgDirs.get_xdg_dir('XDG_STATE_HOME')
-            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
 
     def _make_sure_dirs_exist(self):
         if self.opts['recording_dir'][1] == '':