update/uninstall for windows and ficing install for linux

Author: s-n-g

README.html

@@ -117,6 +117,8 @@ <h2 id="command-line-options">Command line options <span style="padding-left: 10
                         (refer to the output of the -lp option)
   -lp, --list-player-parameters
                         List extra players parameters.
+  -U, --update          Update PyRadio.
+  -R, --uninstall       Uninstall PyRadio.
   --unlock              Remove sessions&#39; lock file.
   -d, --debug           Start pyradio in debug mode.
 </pre>
@@ -560,8 +562,8 @@ <h2 id="todo">TODO <span style="padding-left: 10px;"><sup style="font-size: 50%"
 New player selection configuration window (<a target="_blank" href="https://github.com/coderholic/pyradio/issues/118">#118</a>) - v. 0.8.8.3</li>
 <li><input type="checkbox" disabled="" />
 Notify the user that the package’s stations.csv has changed</li>
-<li><input type="checkbox" disabled="" />
-Update / uninstall using command line parameters (-U / -R)</li>
+<li><input type="checkbox" disabled="" checked="" />
+Update / uninstall using command line parameters (-U / -R) - v. 0.9.0</li>
 <li><input type="checkbox" disabled="" />
 Use Radio Browser service (<a target="_blank" href="https://github.com/coderholic/pyradio/issues/80">#80</a> <a target="_blank" href="https://github.com/coderholic/pyradio/issues/93">#93</a> <a target="_blank" href="https://github.com/coderholic/pyradio/issues/112">#112</a>)</li>
 </ul>

README.md

@@ -92,6 +92,8 @@ optional arguments:
                         (refer to the output of the -lp option)
   -lp, --list-player-parameters
                         List extra players parameters.
+  -U, --update          Update PyRadio.
+  -R, --uninstall       Uninstall PyRadio.
   --unlock              Remove sessions' lock file.
   -d, --debug           Start pyradio in debug mode.
 
@@ -747,7 +749,7 @@ Finally, include the file produced in your report.
 - [x] Players extra parameters ([#118](https://github.com/coderholic/pyradio/issues/118)) - v. 0.8.8.3
 - [x] New player selection configuration window ([#118](https://github.com/coderholic/pyradio/issues/118)) - v. 0.8.8.3
 - [ ] Notify the user that the package's stations.csv has changed
-- [ ] Update / uninstall using command line parameters (-U / -R)
+- [x] Update / uninstall using command line parameters (-U / -R) - v. 0.9.0
 - [ ] Use Radio Browser service ([#80](https://github.com/coderholic/pyradio/issues/80) [#93](https://github.com/coderholic/pyradio/issues/93) [#112](https://github.com/coderholic/pyradio/issues/112))
 
 ## Acknowledgment

devel/build_install_pyradio

@@ -60,11 +60,14 @@ rm -f /tmp/pyradio-uninstall.$$ /tmp/pyradio-delete.$$ 2>/dev/null
 
 function uninstall(){
     local user
-    user=$(which pyradio 2>/dev/null) || {
-        echo "PyRadio is not installed..."
-        exit
+    [ -z "$1" ] && {
+        user=$(which pyradio 2>/dev/null) || {
+            echo "PyRadio is not installed..."
+            exit
+        }
     }
-    echo 'Uninstalling PyRadio'
+    # keep this sudo as to not break lines
+    sudo echo 'Uninstalling PyRadio'
     user=$(which pyradio | grep '\.local')
     [ -z "$user" ] && {
         echo -n '** Removing executable ... '
@@ -233,7 +236,7 @@ for prog in git sed ;do
 done
 
 # uninstall previous versions
-uninstall
+uninstall 1
 
 # delete any files that were left from previous attempt
 [ -z "$TO_USER" ] && {
@@ -288,7 +291,7 @@ python"${TO_PYTHON}" setup.py build && {
         }
     } || {
         echo "***** installing for user..."
-        python"${TO_PYTHON}" setup.py install --user | tee installed && {
+        python"${TO_PYTHON}" setup.py install --user && {
             gzip -k pyradio.1
             mkdir -p ~/.local/share/man/man1 2>/dev/null
             mv -f pyradio.1.gz ~/.local/share/man/man1 2>/dev/null || mv -f pyradio.1.gz ~/.local/local/share/man/man1
@@ -323,6 +326,4 @@ python"${TO_PYTHON}" setup.py build && {
     #git checkout pyradio/radio.py
 }
 rm sed.$$ 2>/dev/null
-[ -z "$REMOVE_DIR" ] || {
-    (sleep 5; sudo rm -r "$REMOVE_DIR") &
-}
+[ -z "$REMOVE_DIR" ] || [[ $REMOVE_DIR == *pyradio ]] && sudo rm -fr "$REMOVE_DIR"

pyradio/__init__.py

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

pyradio/update.py renamed to pyradio/install.py

@@ -55,9 +55,9 @@ class PyRadioUpdate(object):
 
     ZIP_DIR  = ('pyradio-master', 'pyradio-master', 'pyradio-devel')
 
+    install = False
 
     def __init__(self, package=0):
-        package = 2
         if platform.system().lower().startswith('win'):
             raise RuntimeError('This is a linux only class...')
         self._dir = self._install_dir = ''
@@ -72,11 +72,18 @@ def update_pyradio(self, win_open_dir=False):
                 self.update_or_uninstall_on_windows('update')
         else:
             ''' update PyRadio under Linux and MacOS '''
-            print('Updating PyRadio...')
+            if self.install:
+                print('Installing PyRadio...')
+            else:
+                print('Updating PyRadio...')
             if self._do_it():
-                print('\n\nPyRadio updated to the latest release!')
-                print('Thank you for your continuous support to this project!')
-                print('Enjoy!\n')
+                if self.install:
+                    print('\n\nPyRadio succesfully installed!')
+                    print('Hope you have a lot of fun using it!')
+                else:
+                    print('\n\nPyRadio updated to the latest release!')
+                    print('Thank you for your continuous support to this project!')
+                print('Cheers!\n')
                 sys.exit()
             else:
                 print('\n\nAn error occured during the installation!')
@@ -109,7 +116,7 @@ def remove_pyradio(self, win_open_dir=False):
     def update_or_uninstall_on_windows(self, mode='update'):
         isRunning()
         ''' Creates BAT file to update or unisntall PyRadio on Windows'''
-        self._dir = os.path.join(os.path.expanduser('~'), 'tmp_pyradio')
+        self._dir = os.path.join(os.path.expanduser('~'), 'tmp-pyradio')
         shutil.rmtree(self._dir, ignore_errors=True)
         os.makedirs(self._dir, exist_ok=True)
         if mode.startswith('update'):
@@ -125,12 +132,12 @@ def update_or_uninstall_on_windows(self, mode='update'):
                 b.write('CLS\n')
                 b.write('pip install requests --upgrade 1>NUL 2>NUL\n')
                 if mode.startswith('update'):
-                    b.write('COPY "{}" . 1>NUL\n'.format(__file__))
-                    b.write('python update.py --do-update\n')
+                    b.write('COPY "{}" . 1>NUL\n'.format(os.path.abspath(__file__)))
+                    b.write('python install.py --do-update\n')
                     b.write('cd "' + os.path.join(self._dir, self.ZIP_DIR[self._package]) + '"\n')
                     b.write('devel\\build_install_pyradio.bat -U\n')
                 else:
-                    b.write('COPY "{}" uninstall.py 1>NUL\n'.format(__file__))
+                    b.write('COPY "{}" uninstall.py 1>NUL\n'.format(os.path.abspath(__file__)))
                     b.write('python uninstall.py --do-uninstall\n')
                     b.write('cd "' + os.path.join(self._dir, self.ZIP_DIR[self._package]) + '"\n')
                     b.write('devel\\build_install_pyradio.bat -u\n')
@@ -165,9 +172,9 @@ def _do_it(self, mode='update'):
 
         '''' get tmp dir '''
         if os.path.isdir('/tmp'):
-            self._dir = os.path.join('/tmp', 'tmp_pyradio')
+            self._dir = os.path.join('/tmp', 'tmp-pyradio')
         else:
-            self._dir = os.path.join(os.path.expanduser('~'), 'tmp_pyradio')
+            self._dir = os.path.join(os.path.expanduser('~'), 'tmp-pyradio')
         print('Using directory: "{}"'.format(self._dir))
 
         ''' create tmp directory '''
@@ -188,8 +195,10 @@ def _do_it(self, mode='update'):
             print('Error: Failed to download PyRadio source code...\n')
             sys.exit(1)
 
-        ''' PROGRAM DEBUG: uncomment this to use the latest changes '''
-        shutil.copyfile('/home/spiros/projects/my-gits/pyradio/devel/build_install_pyradio', '/tmp/tmp_pyradio/pyradio-devel/devel/build_install_pyradio')
+        ''' PROGRAM DEBUG: uncomment this to use the latest
+            build_install_pyradio changes.
+        '''
+        # shutil.copyfile('/home/spiros/projects/my-gits/pyradio/devel/build_install_pyradio', '/tmp/tmp-pyradio/pyradio/devel/build_install_pyradio')
         if mode == 'update':
             ''' install pyradio '''
             try:
@@ -306,10 +315,9 @@ def _download_file(self, url, filename):
 class PyRadioUpdateOnWindows(PyRadioUpdate):
 
     def __init__(self, fromTUI=False, package=0):
-        package = 2
         if not platform.system().lower().startswith('win'):
             raise RuntimeError('This is a windows only class...')
-        self._dir = os.path.join(os.path.expanduser('~'), 'tmp_pyradio')
+        self._dir = os.path.join(os.path.expanduser('~'), 'tmp-pyradio')
         self._package = package
         self._fromTUI = fromTUI
 
@@ -318,14 +326,14 @@ def print_update_bat_created(cls):
         print('To complete the process you will have to execute a batch file.')
         print('Windows Explorer will open the location of the batch file to run.\n')
         print('Please double click\n\n    update.bat\n\nto get PyRadio\'s latest version.\n')
-        print('After you are done, you can delete the folder named "tmp-pyradio"')
+        print('After you are done, you can delete the folder:\n\n    "{}"'.format(os.path.join(os.path.expanduser("~"), 'tmp-pyradio')))
 
     @classmethod
     def print_uninstall_bat_created(cls):
         print('To complete the process you will have to execute a batch file.')
         print('Windows Explorer will open the location of the batch file to run.\n')
         print('Please double click\n\n    uninstall.bat\n\nto remove PyRadio from your system.\n')
-        print('After you are done, you can delete the folder named "tmp-pyradio"')
+        print('After you are done, you can delete the folder:\n\n    "{}"'.format(os.path.join(os.path.expanduser("~"), 'tmp-pyradio')))
 
     def update_pyradio(self):
         self._do_it()
@@ -353,34 +361,6 @@ def _do_it(self, mode='update'):
             sys.exit(1)
 
         os.chdir(self._dir)
-        cur_dir = os.path.join(self._dir, self.ZIP_DIR[self._package])
-
-
-        shutil.copyfile('C:\\Users\\Spiros\\pyradio\\devel\\build_install_pyradio.bat',
-            'C:\\Users\\Spiros\\tmp_pyradio\\pyradio-devel\\devel\\build_install_pyradio.bat')
-        sys.exit()
-        # input('File copyied... Press ENTER to continue ')
-        if mode == 'update':
-            ''' install pyradio '''
-            try:
-                subprocess.call(os.path.join(cur_dir, 'devel\\build_install_pyradio.bat'), shell=True)
-                ret = True
-            except:
-                ret = False
-            self._clean_up()
-            return ret
-        else:
-            ''' uninstall pyradio '''
-            try:
-                # path = os.path.join(cur_dir, 'devel\\build_install_pyradio.bat')
-                # print('Running BAT file... "{}"'.format(path))
-                subprocess.call(os.path.join(cur_dir, 'devel\\build_install_pyradio.bat') + ' -u', shell=True)
-                ret = True
-            except:
-                ret = False
-                print('Error running BAT file!!!')
-            self._clean_up()
-            return ret
 
 if __name__ == '__main__':
     from argparse import ArgumentParser, SUPPRESS as SUPPRESS
@@ -395,7 +375,7 @@ def _do_it(self, mode='update'):
     ''' extra downloads
         only use them after the developer says so,
         for debug purposes only
-            --sng           download developer release
+            --sng           download developer release (master)
             --sng-devel     download developer devel branch
     '''
     parser.add_argument('--sng', action='store_true', help=SUPPRESS)
@@ -438,8 +418,27 @@ def _do_it(self, mode='update'):
         sys.exit()
     elif args.do_update:
         ''' coming from update BAT file on Windows'''
-        print('do_update')
         upd = PyRadioUpdateOnWindows(package=package)
         upd.update_pyradio()
         sys.exit()
 
+    ''' Installation!!! '''
+    if platform.system().lower().startswith('win'):
+        subprocess.call('pip install windows-curses --upgrade')
+        subprocess.call('pip install pywin32 --upgrade')
+        subprocess.call('pip install requests --upgrade')
+        uni = PyRadioUpdateOnWindows()
+        uni.update_or_uninstall_on_windows(mode='update-open')
+        while not os.path.isfile(os.path.join(uni._dir, 'update.bat')):
+            pass
+        os.chdir(uni._dir)
+        subprocess.call('update.bat')
+        print('\n\nNow you can delete the folder:')
+        print('    "{}"'.format(uni._dir))
+        print('and the file:')
+        print('    "{}"'.format(__file__))
+    else:
+        uni = PyRadioUpdate()
+        uni.install = True
+        uni.update_pyradio()
+

pyradio/log.py

@@ -119,8 +119,9 @@ def write(self,
                             d_msg = self.msg.encode('utf-8', 'replace').strip()[0: self.width].replace('\r', '').replace('\n', '')
                             self.cursesScreen.addstr(0, 1, d_msg)
                         except:
-                            if logger.isEnabledFor(logging.ERROR):
-                                logger.error('Error updating the Status Bar')
+                            pass
+                            # if logger.isEnabledFor(logging.ERROR):
+                            #     logger.error('Error updating the Status Bar')
                     if self._show_status_updates:
                         if logger.isEnabledFor(logging.DEBUG):
                             try:

pyradio/main.py

@@ -2,14 +2,14 @@
 import sys
 import curses
 import logging
-from argparse import ArgumentParser
+from argparse import ArgumentParser, SUPPRESS as SUPPRESS
 from os import path, getenv, environ
 from sys import platform, version_info
 from contextlib import contextmanager
 
 from .radio import PyRadio
 from .config import PyRadioConfig, SUPPORTED_PLAYERS
-from .update import PyRadioUpdate, PyRadioUpdateOnWindows
+from .install import PyRadioUpdate, PyRadioUpdateOnWindows
 
 PATTERN = '%(asctime)s - %(name)s - %(levelname)s - %(message)s'
 
@@ -95,21 +95,37 @@ def shell():
                         help="Remove sessions' lock file.")
     parser.add_argument('-d', '--debug', action='store_true',
                         help='Start pyradio in debug mode.')
+    ''' extra downloads
+        only use them after the developer says so,
+        for debug purposes only
+            --sng             download developer release (master)
+            --sng-devel       download developer devel branch
+            --force-update    give a versio > than current,
+                              to check update notification functionality
+    '''
+    parser.add_argument('--sng-master', action='store_true', help=SUPPRESS)
+    parser.add_argument('--sng-devel', action='store_true', help=SUPPRESS)
+    parser.add_argument('--force-update', default='', help=SUPPRESS)
     args = parser.parse_args()
     sys.stdout.flush()
 
     with pyradio_config_file() as pyradio_config:
 
-        if args.update:
+        if args.update or args.sng_master or args.sng_devel:
             if pyradio_config.distro != 'None' and \
                     not platform.startswith('win'):
                 no_update()
 
+            package = 0
+            if args.sng_master:
+                package = 1
+            elif args.sng_devel:
+                package = 2
             try:
-                upd = PyRadioUpdate(package=2)
+                upd = PyRadioUpdate(package=package)
                 upd.update_pyradio()
             except RuntimeError:
-                upd = PyRadioUpdateOnWindows(package=2)
+                upd = PyRadioUpdateOnWindows(package=package)
                 upd.update_or_uninstall_on_windows(mode='update-open')
             sys.exit()
 
@@ -119,10 +135,10 @@ def shell():
                 no_update(action='uninstall')
 
             try:
-                upd = PyRadioUpdate(package=2)
+                upd = PyRadioUpdate()
                 upd.remove_pyradio()
             except RuntimeError:
-                upd = PyRadioUpdateOnWindows(package=2)
+                upd = PyRadioUpdateOnWindows()
                 upd.update_or_uninstall_on_windows(mode='uninstall-open')
             sys.exit()
 
@@ -294,7 +310,8 @@ def shell():
             pyradio_config,
             play=args.play,
             req_player=requested_player,
-            theme=theme_to_use
+            theme=theme_to_use,
+            force_update=args.force_update
         )
         ''' Setting ESCAPE key delay to 25ms
             Refer to: https://stackoverflow.com/questions/27372068/why-does-the-escape-key-have-a-delay-in-python-curses
@@ -320,18 +337,19 @@ def shell():
                     sys.stdout.write('\x1b]2;PyRadio: Your Internet Radio Player\x07')
             except:
                 pass
-
         sys.stdout.flush()
 
-
+        ''' curses wrapper '''
         curses.wrapper(pyradio.setup)
+
+        ''' curses is off '''
         if pyradio.setup_return_status:
             if pyradio_config.PROGRAM_UPDATE:
                 if platform.startswith('win'):
-                    upd = PyRadioUpdateOnWindows(package=2)
+                    upd = PyRadioUpdateOnWindows()
                     upd.update_or_uninstall_on_windows(mode='update-open')
                 else:
-                    upd = PyRadioUpdate(package=2)
+                    upd = PyRadioUpdate()
                     upd.update_pyradio()
             else:
                 print('\nThank you for using PyRadio. Cheers!')