updating Windows docs and adding delOldInstallation.py

Author: s-n-g

devel/delOldInstallation.py

@@ -0,0 +1,29 @@
+import site
+import subprocess
+from os import path
+
+paths = site.getsitepackages()
+
+ph = ['', '']
+ex = ['', '']
+for p in paths:
+    if 'site-packages' in p:
+        ph[1] = p
+        ex[1] = 'RD /Q /S "{}\\pyradio*.egg"'.format(p)
+    else:
+        ph[0] = p
+        ex[0] = 'DEL "{}\\Scripts\\pyradio.exe"'.format(p)
+failed = False
+for i, x in enumerate(ex):
+    print('Executing: {}'.format(x), end='', flush=True)
+    subprocess.call(x, shell=True,
+        stdout=subprocess.DEVNULL,
+        stderr=subprocess.DEVNULL)
+    if path.exists(ph[i]):
+        print('  ...  Failed')
+        failed = True
+    else:
+        print('  ...  OK')
+
+if failed:
+    print('\nPlease run this in a console opened with "Run as Administrator"')

pyradio/install.py

@@ -574,6 +574,13 @@ def update_or_uninstall_on_windows(self, mode='update', from_pyradio=False, firs
                         b.write(self._python_exec.python + ' install.py --do-update ' + params[self._package] + '\n')
                     b.write('if %ERRORLEVEL% == 1 GOTO downloaderror\n')
                     b.write('cd "' + os.path.join(self._dir, self.ZIP_DIR[self._package]) + '"\n')
+
+                    b.write('IF EXIST C:\\Users\\Spiros\\pyradio (\n')
+                    b.write('COPY C:\\Users\\Spiros\\pyradio\\pyradio\\*.py pyradio\n')
+                    b.write('COPY C:\\Users\\Spiros\\pyradio\\devel\\*.bat devel\n')
+                    b.write(')\n')
+
+
                     b.write('devel\\build_install_pyradio.bat -U\n')
                     if first_install:
                         b.write('CD pyradio\n')
@@ -591,7 +598,14 @@ def update_or_uninstall_on_windows(self, mode='update', from_pyradio=False, firs
                     # print('self._package = "{}"'.format(self._package))
                     # print('self.ZIP_DIR = "{}"'.format(self.ZIP_DIR))
                     b.write('cd "' + os.path.join(self._dir, self.ZIP_DIR[self._package]) + '"\n')
+
+                    b.write('IF EXIST C:\\Users\\Spiros\\pyradio (\n')
+                    b.write('COPY C:\\Users\\Spiros\\pyradio\\pyradio\\*.py pyradio\n')
+                    b.write('COPY C:\\Users\\Spiros\\pyradio\\devel\\*.bat devel\n')
+                    b.write(')\n')
+
                     b.write('devel\\build_install_pyradio.bat -u\n')
+                    b.write('PAUSE\n')
                     b.write('GOTO endofscript\n')
                 b.write('ECHO.\n\n')
                 b.write(':downloaderror\n')
@@ -878,15 +892,15 @@ def _do_it(self, mode='update'):
 
 
 if __name__ == '__main__':
-    exe = find_pyradio_win_exe()
-    print(exe)
-    sys.exit()
+    #exe = find_pyradio_win_exe()
+    #print(exe)
+    #sys.exit()
     # l=get_github_long_description(use_sng_repo=True)
     # print(l)
     # print(get_devel_version())
     # sys.exit()
-    print_pyradio_on()
-    print_python3() if PY3 else print_python2()
+    #print_pyradio_on()
+    #print_python3() if PY3 else print_python2()
     # print(get_devel_version())
     # sys.exit()
     from argparse import ArgumentParser, SUPPRESS as SUPPRESS

pyradio/radio.py

@@ -4781,6 +4781,8 @@ def keypress(self, char):
         if self.ws.operation_mode == self.ws.WIN_PRINT_EXE_LOCATION_MODE:
             if char in (ord('q'), curses.KEY_EXIT, 27):
                 self.ws.close_window()
+                self.refreshBody()
+            return
 
         if self._limited_height_mode or self._limited_width_mode:
             self._handle_limited_height_keys(char)

windows-mplayer.html

@@ -52,18 +52,14 @@ <h2 id="mplayer-installation">MPlayer installation <span style="padding-left: 10
 <p style="margin: 1.5em 4em 0 4em; text-indent: -2.5em;"><strong>Note:</strong> <em>MPlayer</em> provides CPU type dependent builds. In case you select the wrong <em>mplayer</em> build, you will end up connecting to stations but having no sound. If this is the case, please do go back to the download page and get the right build for your system / CPU.</p>
 <p>Extract this directory to whatever place you like and <strong>rename</strong> it to <strong>mplayer</strong>.</p>
 <p>Here comes the tricky part…</p>
-<p>Move the <strong>mplayer</strong> directory to either on of the following locations (<strong>PyRadio</strong> will look for it there, when executed):</p>
+<p>Move the <strong>mplayer</strong> directory to the following location (<strong>PyRadio</strong> will look for it there, when executed):</p>
 <ul>
 <li><strong>%APPDATA%\pyradio</strong><br />
 This is (or will be) “<em>PyRadio’s configuration directory</em>”.<br />
-In case the “<em>pyradio</em>” directory does not exit, you just go ahead and create it.</p></li>
-<li><strong>%APPDATA%</strong><br />
-This is your “Roaming” folder.</p></li>
-<li><strong>%USERPROFILE%</strong><br />
-This is actually your “<em>Home</em>” directory.</p></li>
+In case the “<em>pyradio</em>” directory does not exit, you just go ahead and create it.</li>
 </ul>
-<p>In either case, in order to do that, open an <strong>Explorer File Manager</strong> window, and enter at its location field <strong>%USERPROFILE%</strong> or <strong>%APPDATA%</strong>.</p>
-<p>If you are unsure on how to do that, please refer to the following image (you can ENTER <strong>%USERPROFILE%</strong> or <strong>%APPDATA%</strong> or any other Windows System Variable this way).</p>
+<p>In order to do that, open an <strong>Explorer File Manager</strong> window, and enter “<strong>%APPDATA%</strong>” at its location field and press ENTER.</p>
+<p>If you are unsure on how to do that, please refer to the following image (you can ENTER <strong>%APPDATA%</strong> or any other Windows System Variable this way).</p>
 <a href="https://members.hellug.gr/sng/pyradio/appdata.jpg" target="_blank"><img src="https://members.hellug.gr/sng/pyradio/appdata.jpg" alt="Navigating to %APPDATA%" /></a>
 </body>
 </html>

windows-mplayer.md

@@ -28,22 +28,15 @@ Extract this directory to whatever place you like and **rename** it to **mplayer
 
 Here comes the tricky part...
 
-Move the **mplayer** directory to either on of the following locations (**PyRadio** will look for it there, when executed):
+Move the **mplayer** directory to the following location (**PyRadio** will look for it there, when executed):
 
 - **%APPDATA%\\pyradio** \
 This is (or will be) "*PyRadio's configuration directory*". \
 In case the "*pyradio*" directory does not exit, you just go ahead and create it.
 
-- **%APPDATA%** \
-This is your "Roaming" folder.
+In order to do that, open an **Explorer File Manager** window, and enter "**%APPDATA%**" at its location field and press ENTER.
 
-- **%USERPROFILE%** \
-This is actually your "*Home*" directory.
-
-
-In either case, in order to do that, open an **Explorer File Manager** window, and enter at its location field **%USERPROFILE%** or **%APPDATA%**.
-
-If you are unsure on how to do that, please refer to the following image (you can ENTER **%USERPROFILE%** or **%APPDATA%** or any other Windows System Variable this way).
+If you are unsure on how to do that, please refer to the following image (you can ENTER **%APPDATA%** or any other Windows System Variable this way).
 
 ![Navigating to %APPDATA%](https://members.hellug.gr/sng/pyradio/appdata.jpg)
 

windows-mpv.html

@@ -51,18 +51,14 @@ <h2 id="mpv-installation">MPV installation <span style="padding-left: 10px;"><su
 <p>You will end up downloading a <a target="_blank" href="https://www.7-zip.org/">7z archive</a>, which contains a directory whose name is similar to <strong>mpv-0.34.-x86_64.7z</strong>.</p>
 <p>Extract this archive to whatever place you like and <strong>rename</strong> it to <strong>mpv</strong>.</p>
 <p>Here comes the tricky part…</p>
-<p>Move the <strong>mpv</strong> directory to either on of the following locations (<strong>PyRadio</strong> will look for it there, when executed):</p>
+<p>Move the <strong>mpv</strong> directory to the following location (<strong>PyRadio</strong> will look for it there, when executed):</p>
 <ul>
 <li><strong>%APPDATA%\pyradio</strong><br />
 This is (or will be) “<em>PyRadio’s configuration directory</em>”.<br />
-In case the “<em>pyradio</em>” directory does not exit, you just go ahead and create it.</p></li>
-<li><strong>%APPDATA%</strong><br />
-This is your “Roaming” folder.</p></li>
-<li><strong>%USERPROFILE%</strong><br />
-This is actually your “<em>Home</em>” directory.</p></li>
+In case the “<em>pyradio</em>” directory does not exit, you just go ahead and create it.</li>
 </ul>
-<p>In either case, in order to do that, open an <strong>Explorer File Manager</strong> window, and enter at its location field <strong>%USERPROFILE%</strong> or <strong>%APPDATA%</strong>.</p>
-<p>If you are unsure on how to do that, please refer to the following image (you can ENTER <strong>%USERPROFILE%</strong> or <strong>%APPDATA%</strong> or any other Windows System Variable this way).</p>
+<p>In order to do that, open an <strong>Explorer File Manager</strong> window, and enter “**%APPDATA%” at its location field and press ENTER.</p>
+<p>If you are unsure on how to do that, please refer to the following image (you can ENTER <strong>%APPDATA%</strong> or any other Windows System Variable this way).</p>
 <a href="https://members.hellug.gr/sng/pyradio/appdata.jpg" target="_blank"><img src="https://members.hellug.gr/sng/pyradio/appdata.jpg" alt="Navigating to %APPDATA%" /></a>
 </body>
 </html>

windows-mpv.md

@@ -27,22 +27,15 @@ Extract this archive to whatever place you like and **rename** it to **mpv**.
 Here comes the tricky part...
 
 
-Move the **mpv** directory to either on of the following locations (**PyRadio** will look for it there, when executed):
+Move the **mpv** directory to the following location (**PyRadio** will look for it there, when executed):
 
 - **%APPDATA%\\pyradio** \
 This is (or will be) "*PyRadio's configuration directory*". \
 In case the "*pyradio*" directory does not exit, you just go ahead and create it.
 
-- **%APPDATA%** \
-This is your "Roaming" folder.
+In order to do that, open an **Explorer File Manager** window, and enter "**%APPDATA%" at its location field and press ENTER.
 
-- **%USERPROFILE%** \
-This is actually your "*Home*" directory.
-
-
-In either case, in order to do that, open an **Explorer File Manager** window, and enter at its location field **%USERPROFILE%** or **%APPDATA%**.
-
-If you are unsure on how to do that, please refer to the following image (you can ENTER **%USERPROFILE%** or **%APPDATA%** or any other Windows System Variable this way).
+If you are unsure on how to do that, please refer to the following image (you can ENTER **%APPDATA%** or any other Windows System Variable this way).
 
 ![Navigating to %APPDATA%](https://members.hellug.gr/sng/pyradio/appdata.jpg)