Skip to content

Commit 28c161f

Browse files
committed
- 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)
1 parent bc73ea8 commit 28c161f

22 files changed

+1507
-278
lines changed

Changelog

+13-11
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
2021-10-20 s-n-g
1+
2022-01-17 s-n-g
2+
* version 0.8.9.10 (0.9-beta7)
3+
* RadioBrowser config window almost finished
4+
* RadioBrowser search window shortcuts changes
5+
* save config before entering config window, when theme is changed
6+
* fixing compiling/build error for arch linux (#146)
7+
* fixing Windows installation as per (#145)
28
* adding check for -p parameter (int)
39
* keep looking for a station after playback failure when random is on
410
* trying to better VLC start of playback detection
5-
* last opened playlist will restore station selection or resume playback
611
* trying to eliminate crashes when window width gets small
712
(like in tilling managers)
813
* show correct help page when in online browser
914
* disabling theme editing per (#141)
10-
* mplayer on Windows: do not fail to start a station
11-
after astop/start command
12-
* install.py will always use the requested python version
13-
* install.py will use special indication per command line
14-
(-sng for --sng-master and -sng-dev for --sng-devel)
15-
* Windows installation will fail if a dependency fails to install
16-
* updating docs (adding "Limited display" image")
17-
18-
2021-09-14 s-n-g
1915
* adding last opened playlist support as per (#138)
2016
* HTML help can be displayed using \h
2117
* Fixing installation of HTML files for all platforms and modes
2218
* Incorporating the Changelog into README.html (offline help)
19+
* install.py will always use the requested python version
20+
* install.py will use special indication per command line
21+
(-sng for --sng-master and -sng-dev for --sng-devel)
2322
* Adding --git option to install.py
23+
* Windows installation will fail if a dependency fails to install
24+
* mplayer on Windows: do not fail to start a station
25+
after astop/start command
2426
* Updating docs
2527

2628
2021-08-31 s-n-g

README.html

+20-12
Original file line numberDiff line numberDiff line change
@@ -135,36 +135,39 @@ <h2 id="requirements">Requirements <span style="padding-left: 10px;"><sup style=
135135
<ul>
136136
<li>requests</li>
137137
<li>dnspython</li>
138+
<li>psutil</li>
138139
</ul></li>
139140
<li>MPV, MPlayer or VLC installed and in your path</li>
140141
</ul>
141142
<!-- Changelog -->
142143
<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>
143144
<pre style="height: 200px;">
144145

145-
2021-10-20 s-n-g
146+
2022-01-17 s-n-g
147+
* version 0.8.9.10 (0.9-beta7)
148+
* RadioBrowser config window almost finished
149+
* RadioBrowser search window shortcuts changes
150+
* save config before entering config window, when theme is changed
151+
* fixing compiling/build error for arch linux (#146)
152+
* fixing Windows installation as per (#145)
146153
* adding check for -p parameter (int)
147154
* keep looking for a station after playback failure when random is on
148155
* trying to better VLC start of playback detection
149-
* last opened playlist will restore station selection or resume playback
150156
* trying to eliminate crashes when window width gets small
151157
(like in tilling managers)
152158
* show correct help page when in online browser
153159
* disabling theme editing per (#141)
154-
* mplayer on Windows: do not fail to start a station
155-
after astop/start command
156-
* install.py will always use the requested python version
157-
* install.py will use special indication per command line
158-
(-sng for --sng-master and -sng-dev for --sng-devel)
159-
* Windows installation will fail if a dependency fails to install
160-
* updating docs (adding "Limited display" image")
161-
162-
2021-09-14 s-n-g
163160
* adding last opened playlist support as per (#138)
164161
* HTML help can be displayed using \h
165162
* Fixing installation of HTML files for all platforms and modes
166163
* Incorporating the Changelog into README.html (offline help)
164+
* install.py will always use the requested python version
165+
* install.py will use special indication per command line
166+
(-sng for --sng-master and -sng-dev for --sng-devel)
167167
* Adding --git option to install.py
168+
* Windows installation will fail if a dependency fails to install
169+
* mplayer on Windows: do not fail to start a station
170+
after astop/start command
168171
* Updating docs
169172

170173
2021-08-31 s-n-g
@@ -1169,7 +1172,12 @@ <h2 id="reporting-bugs">Reporting bugs <span style="padding-left: 10px;"><sup st
11691172
<p>Finally, include the file produced in your report.</p>
11701173
<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>
11711174
<p>If you are a packager and would like to produce a package for your distribution please do follow this mini guide.</p>
1172-
<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>
1175+
<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>
1176+
<ol type="1">
1177+
<li>requests</li>
1178+
<li>dnspython</li>
1179+
<li>psutil</li>
1180+
</ol>
11731181
<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>
11741182
<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>
11751183
<p>Once you are in the sources top level directory (typically “<em>pyradio</em>”), you execute the command:</p>

README.md

+3
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ and much more...
8282
* python 2.7/3.5+
8383
- requests
8484
- dnspython
85+
- psutil
8586
* MPV, MPlayer or VLC installed and in your path
8687

8788
<!-- Changelog -->
@@ -819,8 +820,10 @@ Finally, include the file produced in your report.
819820
If you are a packager and would like to produce a package for your distribution please do follow this mini guide.
820821

821822
First of all, make sure you declare the pacakges's requirements to the relevant section of your manifest (or whatever) file. These are:
823+
822824
1. requests
823825
2. dnspython
826+
3. psutil
824827

825828
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.
826829

build.html

+10-2
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,19 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
5757
<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>
5858
<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>
5959
<h3 id="linux">Linux</h3>
60-
<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>
60+
<p>Use your distribution method to install</p>
61+
<ol type="1">
62+
<li><em>python-setuptools</em></li>
63+
<li><em>python-requests</em></li>
64+
<li><em>python-dnspython</em></li>
65+
<li><em>python-psutil</em></li>
66+
<li><em>sed</em></li>
67+
<li>any one of <em>MPV</em>, <em>MPlayer</em> and/or <em>VLC</em>.</li>
68+
</ol>
6169
<p>When you are done, proceed to “<a href="#performing-the-installation">Performing the installation</a>”.</p>
6270
<h3 id="macos">macOS</h3>
6371
<p>First thing you do is install python dependencies (assuming python 3 is installed):</p>
64-
<pre>pip3 install --upgrade requests dnspython</pre>
72+
<pre>pip3 install --upgrade requests dnspython psutil</pre>
6573
<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>
6674
<p>Open a <strong>terminal</strong> and type:</p>
6775
<pre>/usr/bin/ruby -e &quot;$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)&quot;</pre>

build.md

+6-4
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,14 @@ Before installing **PyRadio** you have to prepare your system, so that you end u
2525

2626
### Linux
2727

28-
Use your distribution method to install
28+
Use your distribution method to install
29+
2930
1. *python-setuptools*
3031
2. *python-requests*
3132
3. *python-dnspython*
32-
4. *sed*
33-
5. any one of *MPV*, *MPlayer* and/or *VLC*.
33+
4. *python-psutil*
34+
5. *sed*
35+
6. any one of *MPV*, *MPlayer* and/or *VLC*.
3436

3537
When you are done, proceed to "[Performing the installation](#performing-the-installation)".
3638

@@ -39,7 +41,7 @@ When you are done, proceed to "[Performing the installation](#performing-the-in
3941

4042
First thing you do is install python dependencies (assuming python 3 is installed):
4143

42-
pip3 install --upgrade requests dnspython
44+
pip3 install --upgrade requests dnspython psutil
4345

4446
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.
4547

devel/build_install_pyradio

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ do
230230
TO_PYTHON_FROM_X=1
231231
shift
232232
;;
233-
-no-dev)
233+
-n)
234234
NO_DEV=1
235235
shift
236236
;;

devel/build_install_pyradio.bat

+5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,11 @@ IF "%1"=="" (
5555
set ERRPKG=dnspython
5656
GOTO piperror
5757
)
58+
pip install psutil --upgrade 1>NUL 2>NUL
59+
if ERRORLEVEL 1 (
60+
set ERRPKG=psutil
61+
GOTO piperror
62+
)
5863
)
5964

6065
IF '%1'=='ELEV' ( GOTO START ) ELSE ( ECHO Running elevated in a different window)

devel/pre-commit

+2-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,8 @@ do
111111
-e 's/<.sup>P/^P/' \
112112
-e 's|N<strong>, </strong>\^P|N</strong>, <strong>^P|' \
113113
-e 's|<sup>X<strong>|^X</strong>|' \
114-
-e 's|<.strong>v<strong>|<strong>v</strong>|' \
115-
-e 's|<.strong><.sup>V<.strong>|<strong>^V</strong>|' \
114+
-e 's|<.strong>w<strong>|<strong>w</strong>|' \
115+
-e 's|<.strong><.sup>W<.strong>|<strong>^W</strong>|' \
116116
"$out"
117117
fi
118118

pyradio.1

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
.\" Copyright (C) 2011 Ben Dowling <http://www.coderholic.com/pyradio>
22
.\" This manual is freely distributable under the terms of the GPL.
33
.\"
4-
.TH pyradio 1 "November 2021" PyRadio
4+
.TH pyradio 1 "January 2022" PyRadio
55

66
.SH Name
77
.PP

pyradio/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
" pyradio -- Console radio player. "
22

3-
version_info = (0, 8, 9, 9)
3+
version_info = (0, 8, 9, 10)
44

55
# Application state:
66
# New stable version: ''

0 commit comments

Comments
 (0)