- version 0.9.3.11.5 - 0.9.3.12-beta5

s-n-g · s-n-g · commit 1fbbe034557a · 2025-02-27T13:25:50.000+02:00
- config.py: add playlist comments to save_playlist_file
- all functions that create or alter a playlist station will
  comply to Station(IntEnum) length
- fixing md to html links (when they contain a single quote)
diff --git a/Changelog b/Changelog
@@ -1,10 +1,15 @@
-2025-01-XX s-n-g
+2025-02-27 s-n-g
     * version 0.9.3.11.5 - 0.9.3.12-beta5
+    * fixing the installation script
+    * playlist format change: adding profile, buffering, http, volume
+      and referer fields (support for these fields not implemented yet)
+    * referer files will be integrated to playlists
     * config option added to invert the mouse wheel action (#272)
     * fixing #276 : mouse support will always be on
         - if disabled, mouse keys will be ignored
         - toggling the config option does not require a program restart any more
-    * removing ont working stations from stations.csv
+    * fixing #277: installation fails when username contains a space character
+    * removing not working stations from stations.csv
     * updating docs
 
 2025-01-18 s-n-g
diff --git a/devel/pre-commit b/devel/pre-commit
@@ -158,6 +158,8 @@ for afile in index.md \
     client.md \
     rec-dir.md
 do
+    sed -i -e "s/'s-/s-/g" -e "s/s'-/s-/g"  "$afile"
+    git add "$afile"
     echo -ne '.'
 #[ -z "$(git status | grep ${afile})" ] || {
     out=${afile/%.md/.html}
@@ -260,6 +262,9 @@ do
         sed -i -e '/img */s/750px/35%/' "$out"
     fi
     #
+    # fix #links
+    sed -i '/href="#/s/\&#39;//g' "$out"
+    #
     # convert images to links
     images_to_links "$out"
     if [ "$out" = "radio-browser.html" ];then
diff --git a/docs/client.html b/docs/client.html
@@ -64,7 +64,7 @@ <h3 id="command-line-parameters">Command line parameters</h3>
 
 Server Parameters:
   -s SERVER_AND_PORT, --server_and_port SERVER_AND_PORT
-                        Set the servers&#39;s IP and PORT (format: IP:PORT)
+                        Set the server IP and PORT (format: IP:PORT)
   -r, --reverse-detection
                         Reverse server detection (when no server IP and PORT
                         specified); detect headless server last, instead of
diff --git a/docs/client.md b/docs/client.md
@@ -33,7 +33,7 @@ General options:
 
 Server Parameters:
   -s SERVER_AND_PORT, --server_and_port SERVER_AND_PORT
-                        Set the servers's IP and PORT (format: IP:PORT)
+                        Set the server IP and PORT (format: IP:PORT)
   -r, --reverse-detection
                         Reverse server detection (when no server IP and PORT
                         specified); detect headless server last, instead of
diff --git a/docs/index.html b/docs/index.html
@@ -81,15 +81,15 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
 <li><a href="#cjk-characters-support">CJK characters support</a></li>
 </ul></li>
 <li><a href="#moving-stations-around">Moving stations around</a></li>
-<li><a href="#specifying-stations&#39;-encoding">Specifying stations’ encoding</a>
+<li><a href="#specifying-stations-encoding">Specifying stations’ encoding</a>
 <ul>
 <li><a href="#station-by-station-encoding-declaration">Station by station encoding declaration</a></li>
 <li><a href="#global-encoding-declaration">Global encoding declaration</a></li>
 </ul></li>
 <li><a href="#player-detection-/-selection">Player detection / selection</a>
 <ul>
 <li><a href="#changing-player-mid-session">Changing player mid-session</a></li>
-<li><a href="#specifying-a-station&#39;s-referer-url">Specifying a station’s Referer URL</a>
+<li><a href="#specifying-a-stations-referer-url">Specifying a station’s Referer URL</a>
 <ul>
 <li><a href="#note-about-mplayer">Note about MPlayer</a></li>
 <li><a href="#referer-support-in-the-playlist">Referer support in the playlist</a></li>
@@ -191,13 +191,18 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <h2 id="changelog">Changelog <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></span></h2>
 <pre style="height: 200px;">
 
-2025-01-XX s-n-g
+2025-02-27 s-n-g
     * version 0.9.3.11.5 - 0.9.3.12-beta5
+    * fixing the installation script
+    * playlist format change: adding profile, buffering, http, volume
+      and referer fields (support for these fields not implemented yet)
+    * referer files will be integrated to playlists
     * config option added to invert the mouse wheel action (#272)
     * fixing #276 : mouse support will always be on
         - if disabled, mouse keys will be ignored
         - toggling the config option does not require a program restart any more
-    * removing ont working stations from stations.csv
+    * fixing #277: installation fails when username contains a space character
+    * removing not working stations from stations.csv
     * updating docs
 
 2025-01-18 s-n-g
@@ -1647,7 +1652,7 @@ <h2 id="about-playlist-files">About Playlist files <span style="padding-left: 10
 <li><p>The sixth column will determine whether <strong>Buffering</strong> will be used (more on this at <a href="#buffering">Buffering</a>).</p></li>
 <li><p>The seventh column will determine whether the station will be forced to be using http instead of https (more on this at <a href="#player-connection-protocol">Player connection protocol</a>).</p></li>
 <li><p>The eight column defines the volume value to be used.</p></li>
-<li><p>The last column will define the referer to be used (more on this at <a href="##specifying-a-station&#39;s-referer-url">Specifying a station’s Referer URL</a>).</p></li>
+<li><p>The last column will define the referer to be used (more on this at <a href="#specifying-a-stations-referer-url">Specifying a station’s Referer URL</a>).</p></li>
 </ul>
 <p>The following table presents the <strong>Station’s fields</strong> and the current level of support.</p>
 <table>
diff --git a/docs/index.md b/docs/index.md
@@ -34,12 +34,12 @@ Command line internet radio player.
 * [Line editor](#line-editor)
     * [CJK characters support](#cjk-characters-support)
 * [Moving stations around](#moving-stations-around)
-* [Specifying stations' encoding](#specifying-stations'-encoding)
+* [Specifying stations' encoding](#specifying-stations-encoding)
     * [Station by station encoding declaration](#station-by-station-encoding-declaration)
     * [Global encoding declaration](#global-encoding-declaration)
 * [Player detection / selection](#player-detection-/-selection)
     * [Changing player mid-session](#changing-player-mid-session)
-    * [Specifying a station's Referer URL](#specifying-a-station's-referer-url)
+    * [Specifying a station's Referer URL](#specifying-a-stations-referer-url)
         * [Note about MPlayer](#note-about-mplayer)
         * [Referer support in the playlist](#referer-support-in-the-playlist)
     * [Extra Player Parameters](#extra-player-parameters)
@@ -435,7 +435,7 @@ Optionally, a number of more columns can be used.
 
 - The eight column defines the volume value to be used.
 
-- The last column will define the referer to be used (more on this at [Specifying a station's Referer URL](##specifying-a-station's-referer-url)).
+- The last column will define the referer to be used (more on this at [Specifying a station's Referer URL](#specifying-a-stations-referer-url)).
 
 The following table presents the **Station's fields** and the current level of support.
 
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "pyradio"
-version = "0.9.3.11.4"
+version = "0.9.3.11.5"
 authors = [
   { name="Ben Dowling", email="ben.m.dowling@gmail.com" },
   { name="Spiros Georgaras", email="sng@hellug.gr" },
diff --git a/pyradio/__init__.py b/pyradio/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 " pyradio -- Console radio player. "
 
-version_info = (0, 9, 3, 11, 4)
+version_info = (0, 9, 3, 11, 5)
 
 # Set it to True if new stations have been
 # added to the package's stations.csv
diff --git a/pyradio/browser.py b/pyradio/browser.py
@@ -464,8 +464,9 @@ def stations(self, playlist_format=2):
                 if use_fav.endswith('.jpg') or \
                         use_fav.endswith('.png'):
                     fav = use_fav
-                # ret.append([n['name'], n['url'], enc, '', '', '', ''])
-                ret.append([n['name'], n['url'], enc, {'image': fav}, '', '', ''])
+                ret.append(
+                    [n['name'], n['url'], enc, {'image': fav}, '', '', '', '', '']
+                )
         return ret
 
     def save_config(self):
diff --git a/pyradio/client.py b/pyradio/client.py
@@ -280,7 +280,7 @@ def client():
 
     server_opts = parser.add_argument_group('• Server Parameters')
     server_opts.add_argument('-s', '--server_and_port', default='',
-                             help="Set the servers's IP and PORT (format: IP:PORT)")
+                             help="Set the server IP and PORT (format: IP:PORT)")
     server_opts.add_argument('-r', '--reverse-detection', action='store_true', default=False,
                              help='Reverse server detection (when no server IP and PORT specified);'
                              ' detect headless server last, instead of headless server first')
diff --git a/pyradio/config.py b/pyradio/config.py
@@ -906,6 +906,11 @@ def save_playlist_file(self, stationFile=''):
         try:
             with open(st_new_file, 'w', encoding='utf-8') as cfgfile:
                 writter = csv.writer(cfgfile)
+                writter.writerow(['# PyRadio Playlist File Format:'])
+                writter.writerow(
+                    ['# name', 'url', 'encoding', 'icon',
+                     'profile', 'buffering', 'force-http',
+                     'volume', 'referer'])
                 for a_station in self.stations:
                     writter.writerow(self._format_playlist_row(a_station))
         except:
diff --git a/pyradio/edit.py b/pyradio/edit.py
@@ -21,7 +21,7 @@
 from .xdg import CheckDir
 from .html_help import HtmlHelp
 from .keyboard import kbkey, kb2str, kb2chr, check_localized
-from .common import M_STRINGS
+from .common import M_STRINGS, Station
 
 locale.setlocale(locale.LC_ALL, '')    # set your locale
 
@@ -688,6 +688,9 @@ def _return_station(self):
                     self._encoding,
                     {'image': self._line_editor[2].string.strip()}
                 ]
+        max_value = max(station.value for station in Station)
+        while len(self.new_station) <= max_value:
+            self.new_station.append('')
         return ret
 
     def _is_valid_url(self, a_url):
diff --git a/pyradio/install.py b/pyradio/install.py
@@ -17,7 +17,7 @@
 ''' This is PyRadio version this
     install.py was released for
 '''
-PyRadioInstallPyReleaseVersion = '0.9.3.11.4'
+PyRadioInstallPyReleaseVersion = '0.9.3.11.5'
 
 locale.setlocale(locale.LC_ALL, "")
 
