- fixing #233 (move .registers to state dir)

- fixing stations.csv (from erroneous PR)
- updating headless.md

Author: s-n-g

docs/headless.html

@@ -158,21 +158,12 @@ <h4 id="systemd">systemd</h4>
 touch ~/pyradio.log
 /usr/bin/tmux new-session -dA -s pyradio-session /home/spiros/.local/bin/pyradio --headless auto</pre>
 <p>Then create the stop file. Writhe this to <strong>~/.local/bin/stop-headless-pyradio.sh</strong></p>
-<p>Execute the following command:</p>
-<pre>pyradio -pc</pre>
-<p>and examine the value of the config parameter <strong>xdg_compliant</strong>.</p>
-<p>If <strong>xdg_compliant</strong> is <em>True</em>, write this code to the file:</p>
 <pre>#!/bin/bash
 [ -z &quot;$(/usr/bin/tmux ls | grep pyradio-session)&quot; ] || /usr/bin/tmux send-keys -t pyradio-session q
 sleep 2
 [ -z &quot;$(/usr/bin/tmux ls | grep pyradio-session)&quot; ] || /usr/bin/tmux send-keys -t pyradio-session q
+[ -e /home/spiros/.config/pyradio/data/server-headless.txt ] &amp;&amp; rm /home/spiros/.config/pyradio/data/server-headless.txt
 [ -e /home/spiros/.local/state/pyradio/server-headless.txt ] &amp;&amp; rm /home/spiros/.local/state/pyradio/server-headless.txt</pre>
-<p>If <strong>xdg_compliant</strong> is <em>False</em>, write this code to the file, instead:</p>
-<pre>#!/bin/bash
-[ -z &quot;$(/usr/bin/tmux ls | grep pyradio-session)&quot; ] || /usr/bin/tmux send-keys -t pyradio-session q
-sleep 2
-[ -z &quot;$(/usr/bin/tmux ls | grep pyradio-session)&quot; ] || /usr/bin/tmux send-keys -t pyradio-session q
-[ -e /home/spiros/.config/pyradio/data/server-headless.txt ] &amp;&amp; rm /home/spiros/.config/pyradio/data/server-headless.txt</pre>
 <p>Make both files executable:</p>
 <pre>chmod +x ~/.local/bin/start-headless-pyradio.sh
 chmod +x ~/.local/bin/stop-headless-pyradio.sh</pre>
@@ -192,22 +183,12 @@ <h4 id="systemd-1">systemd</h4>
 <pre>#!/bin/bash
 /usr/bin/screen -U -S pyradio-session -d -m /home/spiros/.local/bin/pyradio --headless auto</pre>
 <p>Then create the stop file. Writhe this to <strong>~/.local/bin/stop-headless-pyradio.sh</strong></p>
-<p>Execute the following command:</p>
-<pre>pyradio -pc</pre>
-<p>and examine the value of the config parameter <strong>xdg_compliant</strong>.</p>
-<p>If <strong>xdg_compliant</strong> is <em>True</em>, write this code to the file:</p>
-<pre>#!/bin/bash
-[ -z &quot;$(/usr/bin/screen -ls | grep pyradio-session)&quot; ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
-sleep 2
-[ -z &quot;$(/usr/bin/screen -ls | grep pyradio-session)&quot; ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
-[ -e /home/spiros/.local/state/pyradio/server-headless.txt ] &amp;&amp; rm /home/spiros/.local/state/pyradio/server-headless.txt
-</pre>
-<p>If <strong>xdg_compliant</strong> is <em>False</em>, write this code to the file, instead:</p>
 <pre>#!/bin/bash
 [ -z &quot;$(/usr/bin/screen -ls | grep pyradio-session)&quot; ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
 sleep 2
 [ -z &quot;$(/usr/bin/screen -ls | grep pyradio-session)&quot; ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
 [ -e /home/spiros/.config/pyradio/data/server-headless.txt ] &amp;&amp; rm /home/spiros/.config/pyradio/data/server-headless.txt
+[ -e /home/spiros/.local/state/pyradio/server-headless.txt ] &amp;&amp; rm /home/spiros/.local/state/pyradio/server-headless.txt
 </pre>
 <p>Make both files executable:</p>
 <pre>chmod +x ~/.local/bin/start-headless-pyradio.sh

docs/headless.md

@@ -171,30 +171,13 @@ touch ~/pyradio.log
 
 Then create the stop file. Writhe this to **~/.local/bin/stop-headless-pyradio.sh**
 
-Execute the following command:
-
-    pyradio -pc
-
-and examine the value of the config parameter **xdg_compliant**.
-
-If **xdg_compliant** is *True*, write this code to the file:
-
-```
-#!/bin/bash
-[ -z "$(/usr/bin/tmux ls | grep pyradio-session)" ] || /usr/bin/tmux send-keys -t pyradio-session q
-sleep 2
-[ -z "$(/usr/bin/tmux ls | grep pyradio-session)" ] || /usr/bin/tmux send-keys -t pyradio-session q
-[ -e /home/spiros/.local/state/pyradio/server-headless.txt ] && rm /home/spiros/.local/state/pyradio/server-headless.txt
-```
-
-If **xdg_compliant** is *False*, write this code to the file, instead:
-
 ```
 #!/bin/bash
 [ -z "$(/usr/bin/tmux ls | grep pyradio-session)" ] || /usr/bin/tmux send-keys -t pyradio-session q
 sleep 2
 [ -z "$(/usr/bin/tmux ls | grep pyradio-session)" ] || /usr/bin/tmux send-keys -t pyradio-session q
 [ -e /home/spiros/.config/pyradio/data/server-headless.txt ] && rm /home/spiros/.config/pyradio/data/server-headless.txt
+[ -e /home/spiros/.local/state/pyradio/server-headless.txt ] && rm /home/spiros/.local/state/pyradio/server-headless.txt
 ```
 
 Make both files executable:
@@ -236,31 +219,13 @@ Then create the start file. Write this to **~/.local/bin/start-headless-pyradio.
 
 Then create the stop file. Writhe this to **~/.local/bin/stop-headless-pyradio.sh**
 
-Execute the following command:
-
-    pyradio -pc
-
-and examine the value of the config parameter **xdg_compliant**.
-
-If **xdg_compliant** is *True*, write this code to the file:
-
-```
-#!/bin/bash
-[ -z "$(/usr/bin/screen -ls | grep pyradio-session)" ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
-sleep 2
-[ -z "$(/usr/bin/screen -ls | grep pyradio-session)" ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
-[ -e /home/spiros/.local/state/pyradio/server-headless.txt ] && rm /home/spiros/.local/state/pyradio/server-headless.txt
-
-```
-
-If **xdg_compliant** is *False*, write this code to the file, instead:
-
 ```
 #!/bin/bash
 [ -z "$(/usr/bin/screen -ls | grep pyradio-session)" ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
 sleep 2
 [ -z "$(/usr/bin/screen -ls | grep pyradio-session)" ] || /usr/bin/screen -S pyradio-session -p 0 -X stuff q
 [ -e /home/spiros/.config/pyradio/data/server-headless.txt ] && rm /home/spiros/.config/pyradio/data/server-headless.txt
+[ -e /home/spiros/.local/state/pyradio/server-headless.txt ] && rm /home/spiros/.local/state/pyradio/server-headless.txt
 
 ```
 

pyradio/config

@@ -174,7 +174,7 @@ remote_control_server_auto_start = False
 # Packagers should set this paramater as resired!
 #
 # Default value: False
-xdg_compliant = False
+xdg_compliant = True
 
 # The name of the distribution providing the package. If this parameter is set
 # to anything other than "None" PyRadio will not permit updating (-U command

pyradio/config.py

@@ -167,18 +167,6 @@ def __init__(self, stationFile='', user_config_dir=None):
         if platform.startswith('win'):
             self._open_string_id = 1
 
-        # if sys.platform.startswith('win'):
-        #     self.stations_dir = path.join(getenv('APPDATA'), 'pyradio')
-        #     self.registers_dir = path.join(self.stations_dir, '_registers')
-        # else:
-        #     if user_config_dir is None:
-        #         self.stations_dir = path.join(getenv('HOME', '~'), '.config', 'pyradio')
-        #     else:
-        #         self.stations_dir = user_config_dir
-        #     self.registers_dir = path.join(self.stations_dir, '.registers')
-        # self.data_dir = path.join(self.stations_dir, 'data')
-        # self.state_dir = self.data_dir
-
         if user_config_dir is not None:
             self.stations_dir = user_config_dir
             self.xdg.build_paths()

pyradio/config_window.py

@@ -2677,6 +2677,7 @@ class PyRadioSelectPlaylist(object):
     def __init__(self,
                  parent,
                  config_path,
+                 registers_path,
                  default_playlist,
                  include_registers=False,
                  global_functions=None):
@@ -2700,6 +2701,7 @@ def __init__(self,
             ''' revert to old behavior '''
             self._parent_Y = 1
         self._config_path = config_path
+        self._registers_path = registers_path
         self.playlist = default_playlist
         self._orig_playlist = default_playlist
         self._selected_playlist = default_playlist
@@ -2802,9 +2804,9 @@ def _read_items(self):
         if len(self._items) > 0:
             self._items.sort()
         if self._include_registers:
-            self._registers_path = path.join(self._config_path, '.registers')
-            if platform == 'win32':
-                self._registers_path.replace('.reg', '_reg')
+            # self._registers_path = path.join(self._config_path, '.registers')
+            # if platform == 'win32':
+            #     self._registers_path.replace('.reg', '_reg')
             r_items = glob.glob(path.join(self._registers_path, '*.csv'))
             if r_items:
                 r_items.sort()
@@ -2869,11 +2871,13 @@ def _get_result(self):
         if self._include_registers:
             if self._items[self._selected_playlist_id].startswith('Register: '):
                 ret = self._items[self._selected_playlist_id].replace('Register: ', 'register_')
-                ret = path.join(self._config_path, '.registers', ret + '.csv')
+                ret = path.join(self._registers_path, ret + '.csv')
+                logger.error(f'ret 1: {ret = }')
             else:
-                ret = path.join(self._config_path, self._items[self._selected_playlist_id] + '.csv')
-            if platform == 'win32':
-                ret.replace('.registers', '_registers')
+                ret = path.join(self._registers_path, self._items[self._selected_playlist_id] + '.csv')
+                logger.error(f'ret 2: {ret = }')
+            # if platform == 'win32':
+            #     ret.replace('.registers', '_registers')
             return 0, ret
 
         stationFile = path.join(self._config_path, self._items[self._selected_playlist_id] + '.csv')
@@ -3086,7 +3090,7 @@ class PyRadioSelectStation(PyRadioSelectPlaylist):
 
     _default_playlist = ''
 
-    def __init__(self, parent, config_path, default_playlist, default_station,
+    def __init__(self, parent, config_path, registers_dir, default_playlist, default_station,
                  global_functions=None, is_from_schedule=False):
         self._default_playlist = default_playlist
         self._orig_default_playlist = default_playlist
@@ -3098,7 +3102,7 @@ def __init__(self, parent, config_path, default_playlist, default_station,
         if self._is_from_schedule:
             self._config_path = config_path
             default_station = self._read_items(a_station=default_station)
-        PyRadioSelectPlaylist.__init__(self, parent, config_path, default_station)
+        PyRadioSelectPlaylist.__init__(self, parent, config_path, registers_dir, default_station)
         self._global_functions = set_global_functions(global_functions)
         self._title = ' Station Selection '
         ''' adding 2 to padding calculation

pyradio/main.py

@@ -177,6 +177,26 @@ def _win_python_3_12():
             setattr(curses, key, value)
     return stdscr
 
+def create_systemd_service_files():
+    file_names = ('start-headless-pyradio.sh', 'stop-headless-pyradio.sh', 'pyradio.service')
+    if program == 'tmux':
+        files = (
+r'''#!|SHELL|
+touch |HOME|/pyradio.log
+|PROGRAM| new-session -dA -s pyradio-session |PYRADIO| --headless auto
+''',
+r'''#!|SHELL|
+[ -z "$(|PROGRAM| ls | grep pyradio-session)" ] || |PROGRAM| send-keys -t pyradio-session q
+sleep 2
+[ -z "$(|PROGRAM| ls | grep pyradio-session)" ] || |PROGRAM| sennd-keys -t pyradio-session q
+[ -e |HOME|/.config/pyradio/data/server-headless.txt ] && rm |HOME|/.config/pyradio/data/server-headless.txt
+[ -e |HOME|/.local/state/pyradio/server-headless.txt ] && rm |HOME|/.local/state/pyradio/server-headless.txt
+'''
+                )
+        pass
+    else:
+        pass
+
 def shell():
     version_too_old = False
     if sys.version_info[0] == 2:
@@ -337,6 +357,8 @@ def shell():
                                 help='Show remote control server address.')
         gr_headless.add_argument('-fd', '--free-dead-headless-server', action='store_true',
                                  help='Use this if your headless server has terminated unexpectedly, and you cannot start a new one (you get a message that it is already running).')
+        # gr_headless.add_argument('-gss', '--generate-systemd-service-files', action='store_true',
+                                 help='Create systemd service files to enable / disable headless operation using tmux or screen.')
     args = parser.parse_args()
     sys.stdout.flush()
 
@@ -353,6 +375,10 @@ def shell():
 
     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

pyradio/radio.py

@@ -1991,8 +1991,8 @@ def ctrl_c_handler(self, signum, frame, save_playlist=True):
         # ok
         if self._cnf.titles_log.titles_handler:
             logger.critical('=== Logging stopped')
-        logger.error('signum = {}'.format(signum))
-        logger.error('frame = {}'.format(frame))
+        # logger.error('signum = {}'.format(signum))
+        # logger.error('frame = {}'.format(frame))
         search_cls = [x for x in self._search_classes if x is not None]
         for n in range(len(search_cls)):
             search_cls[n].save_search_history()
@@ -6203,6 +6203,7 @@ def keypress(self, char):
                         self._playlist_select_win = PyRadioSelectPlaylist(
                             self.bodyWin,
                             self._cnf.stations_dir,
+                            self._cnf.registers_dir,
                             self._cnf.station_title,
                             include_registers=True,
                             global_functions=self._global_functions
@@ -6636,6 +6637,7 @@ def keypress(self, char):
                     self._schedule_playlist_select_win = PyRadioSelectPlaylist(
                         self.bodyWin,
                         self._cnf.stations_dir,
+                        self._cnf.registers_dir,
                         self._simple_schedule.playlist,
                         global_functions=self._global_functions
                     )
@@ -6746,6 +6748,7 @@ def keypress(self, char):
                     self._playlist_select_win = PyRadioSelectPlaylist(
                         self.bodyWin,
                         self._cnf.stations_dir,
+                        self._cnf.registers_dir,
                         self._config_win._config_options['default_playlist'][1],
                         global_functions=self._global_functions
                     )

pyradio/stations.csv

@@ -42,4 +42,4 @@ Echoes of Bluemars - Cryosleep,http://streams.echoesofbluemars.org:8000/cryoslee
 Echoes of Bluemars - Voices from Within,http://streams.echoesofbluemars.org:8000/voicesfromwithin.m3u
 Synphaera Radio (Space Music),https://somafm.com/synphaera.pls
 Radio Levač (Serbian Folk & Country),http://213.239.205.210:8046/stream
-Radio 35 (Serbian and English Pop, Folk, Country & Hits),http://stream.radio035.net:8010/listen.pls
+"Radio 35 (Serbian and English Pop, Folk, Country & Hits)",http://stream.radio035.net:8010/listen.pls