- installing png on MacOs

- fixing Windows uninstall (do not remove mpv if n pressed)
- win10toast will be installed upon installation
- updating docs

Author: s-n-g

README.html

@@ -1565,13 +1565,12 @@ <h2 id="desktop-notifications">Desktop Notifications <span style="padding-left:
 <p><strong>PyRadio</strong> can provide Desktop Notifications when a notification daemon is already present (on Linux and BSD), or throught <strong>Windows Notification Service</strong> (<strong>WNS</strong>).</p>
 <p>If enabled, <strong>PyRadio</strong> will display:</p>
 <ol type="1">
-<li>Song info (as provided by the radio station)<br />
-That means that if the radio station does not provide any info, no notification will be issued.</li>
+<li>The playlist name, when playback starts.</li>
+<li>Song info (as provided by the radio station).</li>
 <li>Connection failure messages.</li>
 <li>Player crash messages.</li>
 </ol>
 <p>To find out more about configuring this feature, please refer to <a href="desktop-notification.html">Desktop Notification</a>.</p>
-<p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> If Desktop Notification is enabled by default (in the case of a distro package) users can disable it by creating an empty <strong>~/.config/pyradio/notification</strong> file.</p>
 <h2 id="session-locking">Session Locking <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><strong>PyRadio</strong> uses session locking, which actually means that only the first instance executed within a given session will be able to write to the configuration file.</p>
 <p>Subsequent instances will be “<em>locked</em>”. This means that the user can still play stations, load and edit playlists, load and test themes, but any changes will <strong>not</strong> be recorded in the configuration file.</p>

README.md

@@ -1096,15 +1096,13 @@ To access supported services, just press "**O**" (capital "*o*") at the program'
 
 If enabled, **PyRadio** will display:
 
-1. Song info (as provided by the radio station) \
-That means that if the radio station does not provide any info, no notification will be issued.
-2. Connection failure messages.
-3. Player crash messages.
+1. The playlist name, when playback starts.
+2. Song info (as provided by the radio station).
+3. Connection failure messages.
+4. Player crash messages.
 
 To find out more about configuring this feature, please refer to [Desktop Notification](desktop-notification.md).
 
-**Note:** If Desktop Notification is enabled by default (in the case of a distro package) users can disable it by creating an empty **~/.config/pyradio/notification** file.
-
 ## Session Locking
 
 **PyRadio** uses session locking, which actually means that only the first instance executed within a given session will be able to write to the configuration file.

desktop-notification.md

@@ -28,9 +28,9 @@ The behavior and presentation of notifications greatly depends on the daemon/ser
 If enabled, **PyRadio** will display:
 
 1. The playlist name, when playback starts.
-1. Song info (as provided by the radio station).
-2. Connection failure messages.
-3. Player crash messages.
+2. Song info (as provided by the radio station).
+3. Connection failure messages.
+4. Player crash messages.
 
 Desktop Notifications are disabled by default.
 

devel/build_install_pyradio

@@ -479,10 +479,10 @@ then
             else
                 ./devel/fix_pyradio_desktop_file -i -t "${REQ_TERMINAL}"
             fi
-            mkdir -p ~/.config/pyradio
-            cp devel/pyradio.png ~/.config/pyradio
         fi
     fi
+    mkdir -p ~/.config/pyradio
+    cp devel/pyradio.png ~/.config/pyradio
 else
     do_exit
     exit 1

devel/build_install_pyradio.bat

@@ -9,6 +9,12 @@ REM echo(NO_DEV = %NO_DEV%
 REM GOTO endnopause
 
 CLS
+ECHO Installing / Updating wheel
+%PROGRAM% -m pip install --upgrade wheel 1>NUL 2>NUL
+IF %ERRORLEVEL% == 1 (
+    SET ERRPKG=windows-curses
+    GOTO piperror
+)
 ECHO Installing / Updating setuptools
 %PROGRAM% -m pip install --upgrade setuptools 1>NUL 2>NUL
 IF %ERRORLEVEL% == 1 (
@@ -28,6 +34,7 @@ echo dnspython >> requirements.txt
 echo psutil >> requirements.txt
 echo wheel >> requirements.txt
 echo pylnk >> requirements.txt
+echo win10toast >> requirements.txt
 
 ::Remove the elevation tag and SET the correct working directory
 IF '%1'=='ELEV' ( SHIFT /1 )
@@ -82,7 +89,8 @@ ECHO # This is probably because PyRadio is already #
 ECHO # running, so files cannot be overwritten.    #
 ECHO # Please terminate PyRadio and try again.     #
 ECHO ###############################################
-GOTO endofscript
+IF EXIST "DOPAUSE" ( GOTO endofscript )
+GOTO endnopause
 
 :installhtml
 IF "%NO_DEV%"=="1" (
@@ -198,7 +206,10 @@ ECHO User files are under "%APPDATA%\pyradio"
 SET /p ANS="Do you want to remove them (y/n)?: "
 :: ECHO %ANS%
 IF "%ANS%" == "y" GOTO :addtobat
-IF "%ANS%" == "n" GOTO :addtobat
+IF "%ANS%" == "n" (
+    IF EXIST "DOPAUSE" ( GOTO endofscript )
+    GOTO endnopause
+)
 GOTO :readit
 :addtobat
 

pyradio/install.py

@@ -586,11 +586,13 @@ def update_or_uninstall_on_windows(self, mode='update', from_pyradio=False, firs
             with open(bat, "w") as b:
                 b.write('@ECHO OFF\n')
                 b.write('CLS\n')
+                b.write('python -m pip install --upgrade wheel 1>NUL 2>NUL\n')
+                b.write('if %ERRORLEVEL% == 1 GOTO downloaderror\n')
                 b.write('python -m pip install --upgrade setuptools 1>NUL 2>NUL\n')
                 b.write('if %ERRORLEVEL% == 1 GOTO downloaderror\n')
                 b.write('python -m pip install --upgrade requests 1>NUL 2>NUL\n')
                 b.write('if %ERRORLEVEL% == 1 GOTO downloaderror\n')
-                b.write('python -m pip install --upgrade wheel 1>NUL 2>NUL\n')
+                b.write('python -m pip install --upgrade win10toast 1>NUL 2>NUL\n')
                 b.write('if %ERRORLEVEL% == 1 GOTO downloaderror\n')
                 # b.write('PAUSE\n')
                 if mode.startswith('update'):
@@ -1147,6 +1149,7 @@ def _do_it(self, mode='update'):
                 'patool',
                 'pyunpack',
                 'wheel',
+                'win10toast',
         ):
             print('Checking module: ' + a_module + ' ...')
             ret = subprocess.call('python -m pip install --upgrade ' + a_module,

pyradio/win.py

@@ -392,8 +392,6 @@ def install_player(output_folder=None, package=0, do_not_exit=False):
 
             print(msg.format(to_do[2]))
 
-
-
             while x not in opts:
                 print(prompt,  end='', flush=True)
                 x = getwch()