- changing windows installation method to pip

- adding F7, F8, F9, F10 functionalit on Windows
- updating docs

Author: s-n-g

Changelog

@@ -1,3 +1,8 @@
+2022-03-10 s-n-g
+    * Windows installation method updated to pip
+    * adding F7, F8, F9, F10 functionality for Windows
+    * updating docs
+
 2022-02-14 s-n-g
     * version 0.8.9.14 (0.9-beta11)
     * fixing typo in player.py

README.html

@@ -143,6 +143,11 @@ <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></style></h2>
 <pre style="height: 200px;">
 
+2022-03-10 s-n-g
+    * Windows installation method updated to pip
+    * adding F7, F8, F9, F10 functionality for Windows
+    * updating docs
+
 2022-02-14 s-n-g
     * version 0.8.9.14 (0.9-beta11)
     * fixing typo in player.py

build.html

@@ -43,6 +43,7 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
 <ul>
 <li><a href="#preparing-for-the-installation">Preparing for the installation</a>
 <ul>
+<li><a href="#notice-for-python-2-users">Notice for Python 2 users</a></li>
 <li><a href="#linux">Linux</a></li>
 <li><a href="#macos">macOS</a></li>
 <li><a href="#windows">Windows</a></li>
@@ -56,10 +57,17 @@ <h2 id="table-of-contents">Table of Contents <span style="padding-left: 10px;"><
 <p><a href="README.html">[Return to main doc]</a></p>
 <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="notice-for-python-2-users">Notice for Python 2 users</h3>
+<p>If you are still using <strong>Python 2</strong>, plase make sure “<strong>pip</strong>” is installed. Execute the following command to verify its existance:</p>
+<pre>python[2] -m pip list</pre>
+<p>If you get a response, you are good to go. Otherwise, use your distro package manager to install it.</p>
+<p>If your distro does not provide it (some do not anymore), use the following commands to get it:</p>
+<pre>curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
+sudo python[2] get-pip.py</pre>
 <h3 id="linux">Linux</h3>
 <p>Use your distribution method to install</p>
 <ol type="1">
-<li><em>python-setuptools</em></li>
+<li><em>python-wheel</em></li>
 <li><em>python-requests</em></li>
 <li><em>python-dnspython</em></li>
 <li><em>python-psutil</em></li>
@@ -69,7 +77,7 @@ <h3 id="linux">Linux</h3>
 <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 psutil</pre>
+<pre>pip3 install --upgrade wheel 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://raw.githubusercontent.com/Homebrew/install/master/install)&quot;</pre>

build.md

@@ -8,6 +8,7 @@ Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 <!-- vim-markdown-toc Marked -->
 
 * [Preparing for the installation](#preparing-for-the-installation)
+    * [Notice for Python 2 users](#notice-for-python-2-users)
     * [Linux](#linux)
     * [macOS](#macos)
     * [Windows](#windows)
@@ -23,11 +24,24 @@ Ben Dowling - [https://github.com/coderholic](https://github.com/coderholic)
 
 Before installing **PyRadio** you have to prepare your system, so that you end up with a working installation. The process depends on the OS you are on.
 
+### Notice for Python 2 users
+
+If you are still using **Python 2**, plase make sure "**pip**" is installed. Execute the following command to verify its existance:
+
+    python[2] -m pip list
+
+If you get a response, you are good to go. Otherwise, use your distro package manager to install it.
+
+If your distro does not provide it (some do not anymore), use the following commands to get it:
+
+    curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
+    sudo python[2] get-pip.py
+
 ### Linux
 
 Use your distribution method to install
 
-1. *python-setuptools*
+1. *python-wheel*
 2. *python-requests*
 3. *python-dnspython*
 4. *python-psutil*
@@ -41,7 +55,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 psutil
+    pip3 install --upgrade wheel 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.
 

devel/build_install_pyradio.bat

@@ -1,7 +1,7 @@
 @ECHO OFF
 IF "%1"=="--help" GOTO displayhelp
 IF "%1"=="-h" GOTO displayhelp
-setlocal EnableDelayedExpansion
+SETLOCAL EnableDelayedExpansion
 
 IF EXIST DEV (SET NO_DEV=0) ELSE (SET NO_DEV=1)
 REM echo(NO_DEV = %NO_DEV%
@@ -11,8 +11,8 @@ REM GOTO endnopause
 :: https://gist.github.com/neremin/3a4020c172053d837ab37945d81986f6
 :: https://stackoverflow.com/questions/13212033/get-windows-version-in-a-batch-file
 net session >nul 2>&1
-IF '%errorlevel%' == '0' ( GOTO START ) ELSE (
-    for /f "tokens=4-5 delims=. " %%i in ('ver') do set VERSION=%%i.%%j
+IF "%errorlevel%" == "0" ( GOTO START ) ELSE (
+    FOR /f "tokens=4-5 delims=. " %%i in ('ver') do SET VERSION=%%i.%%j
     IF "%version%" == "6.1" ( GOTO win7exit )
     IF "%version%" == "6.0" ( GOTO win7exit )
     GOTO getPrivileges
@@ -36,47 +36,47 @@ IF "%1"=="" (
     CLS
     ECHO Installing / Updating python modules
     pip install --upgrade windows-curses 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=windows-curses
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=windows-curses
         GOTO piperror
     )
     pip install --upgrade pywin32 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=pywin32
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=pywin32
         GOTO piperror
     )
     pip install --upgrade requests 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=requests
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=requests
         GOTO piperror
     )
     pip install --upgrade dnspython 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=dnspython
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=dnspython
         GOTO piperror
     )
     pip install --upgrade psutil 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=psutil
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=psutil
         GOTO piperror
     )
     pip install --upgrade patool 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=patool
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=patool
         GOTO piperror
     )
     pip install --upgrade psutil 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=pyunpack
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=pyunpack
         GOTO piperror
     )
     pip install --upgrade wheel 1>NUL 2>NUL
-    if %ERRORLEVEL% == 1 (
-        set ERRPKG=wheel
+    IF %ERRORLEVEL% == 1 (
+        SET ERRPKG=wheel
         GOTO piperror
     )
 )
-goto START
+GOTO START
 IF '%1'=='ELEV' ( GOTO START ) ELSE ( ECHO Running elevated in a different window)
 ECHO >>DOPAUSE
 
@@ -262,33 +262,56 @@ GOTO endnopause
 ECHO This may take some time...
 ECHO ***********************************************************
 ECHO.
-ECHO PyRadio will NOT uninstall NPV, MPlayer, Python and/or Git.
-ECHO You will have to manually uninstall them.
-ECHO.
-ECHO PyRadio user files will be left instact.
-ECHO You can find them at
-ECHO     %APPDATA%\pyradio
+ECHO PyRadio will NOT uninstall Python and/or Git.
+ECHO You will have to manually uninstall them (IF desired).
 ECHO.
 ECHO ***********************************************************
 ECHO.
 DEL pyremove.bat 2>NUL
 ECHO ECHO Uninstalling PyRadio>>pyremove.bat
-ECHO ECHO ** Gathering information...>>pyremove.bat
-ECHO ECHO ** Removing executable ... done>>pyremove.bat
-ECHO ECHO ** Removing Desktop shortcut ... done >>pyremove.bat
-ECHO IF EXIST "%DESKTOP%\PyRadio.lnk" DEL "%DESKTOP%\PyRadio.lnk" 2>NUL >>pyremove.bat
-python devel\site.py exe 2>NUL >>pyremove.bat
-python devel\site.py 2>NUL >dirs
-python -m site --user-site 2>NUL >>dirs
-python devel\windirs.py
+:: ECHO ECHO ** Gathering information>>pyremove.bat
+:: ECHO ECHO ** Removing executable>>pyremove.bat
+ECHO ECHO ** Removing Desktop shortcut>>pyremove.bat
+ECHO IF EXIST "%DESKTOP%\PyRadio.lnk" DEL "%DESKTOP%\PyRadio.lnk">>pyremove.bat
+:: python devel\site.py exe 2>NUL >>pyremove.bat
+:: python devel\site.py 2>NUL >dirs
+:: python -m site --user-site 2>NUL >>dirs
+:: python devel\windirs.py
 python devel\unreg.py
-ECHO DEL dirs >>pyremove.bat
-ECHO python -m pip uninstall -y pyradio >>pyremove.bat
-ECHO ECHO. >>pyremove.bat
-ECHO ECHO. >>pyremove.bat
-ECHO ECHO PyRadio successfully uninstalled! >>pyremove.bat
-ECHO ECHO. >>pyremove.bat
-:: IF EXIST "DOPAUSE" ( ECHO PAUSE >>pyremove.bat )
+
+SET ANS=""
+:readit
+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
+GOTO :readit
+:addtobat
+
+IF "%ANS%" == "y" (
+    ECHO ECHO ** Removing user files>>pyremove.bat
+    ECHO RD /Q /S "%APPDATA%\pyradio">>pyremove.bat
+) else (
+    ECHO ECHO ** Removing stations.csv>>pyremove.bat
+    ECHO DEL "%APPDATA%\pyradio\stations.csv">>pyremove.bat
+    IF EXIST %APPDATA%\pyradio\mpv (
+        ECHO ECHO ** Removing MPV>>pyremove.bat
+        ECHO RD /Q /S "%APPDATA%\pyradio\mpv">>pyremove.bat
+    )
+    IF EXIST %APPDATA%\pyradio\mplayer (
+        ECHO ECHO ** Removing MPlayer>>pyremove.bat
+        ECHO RD /Q /S "%APPDATA%\pyradio\mplayer">>pyremove.bat
+    )
+)
+
+ECHO IF EXIST dirs DEL dirs >>pyremove.bat
+ECHO python -m pip uninstall -y pyradio>>pyremove.bat
+ECHO ECHO.>>pyremove.bat
+ECHO ECHO.>>pyremove.bat
+:: ECHO ECHO PyRadio successfully uninstalled! >>pyremove.bat
+::ECHO ECHO. >>pyremove.bat
+IF EXIST "DOPAUSE" ( ECHO PAUSE>>pyremove.bat )
 :: PAUSE
 CALL pyremove.bat
 IF %ALL% == 1 ( GOTO noparam )

pyradio/__init__.py

@@ -1,6 +1,6 @@
 " pyradio -- Console radio player. "
 
-version_info = (0, 8, 9, 14)
+version_info = (0, 8, 9, 15)
 
 # Application state:
 # New stable version:  ''

pyradio/config.py

@@ -1139,10 +1139,13 @@ class PyRadioConfig(PyRadioStations):
     current_pyradio_version = None
 
     ''' Windows manage players trigger '''
-    MANAGE_PLAYERS = False
+    WIN_MANAGE_PLAYERS = False
 
     ''' Windows print EXE location trigger '''
-    PRINT_PATHS = False
+    WIN_PRINT_PATHS = False
+
+    ''' Windows Uninstall trigger '''
+    WIN_UNINSTALL = False
 
     def __init__(self):
         self.backup_player_params = None

pyradio/main.py

@@ -443,12 +443,37 @@ def shell():
 
         ''' curses is off '''
         if pyradio.setup_return_status:
-            if pyradio_config.PRINT_PATHS and platform.startswith('win'):
+            if pyradio_config.WIN_UNINSTALL and platform.startswith('win'):
+                from msvcrt import getwch
+                from os import sep
+                import subprocess
+                the_path = __file__.split(sep)
+                the_file = sep.join(the_path[:-1]) + sep + 'install.py'
+                print('\nTo complete the process you will have to execute a batch file.')
+                print('Windows Explorer will open the location of the batch file to run.')
+                print('')
+                print('Please double click')
+                print('')
+                print('    uninstall.bat')
+                print('')
+                print('to remove PyRadio from your system.')
+                print('')
+                print('After you are done, you can delete the folder it resides in.')
+                print('\nPress any key to continue...', end='', flush=True)
+                getwch()
+                #print('\nPress any key to exit...', end='', flush=True)
+                #getwch()
+                subprocess.call('python ' + the_file + ' -R',
+                    stdout=subprocess.DEVNULL,
+                    stderr=subprocess.DEVNULL)
+                sys.exit()
+
+            if pyradio_config.WIN_PRINT_PATHS and platform.startswith('win'):
                 ''' print exe path '''
                 print('')
                 print_exe_paths()
 
-            if pyradio_config.MANAGE_PLAYERS and platform.startswith('win'):
+            if pyradio_config.WIN_MANAGE_PLAYERS and platform.startswith('win'):
                 ''' manage players'''
                 from .win import install_player
                 install_player()