- fixing potential update thread crash

- build_install_pyradio will report exit code

Author: s-n-g

Changelog

@@ -1,14 +1,17 @@
-2021-10-14 s-n-g
+2021-10-20 s-n-g
     * adding check for -p parameter (int)
     * keep looking for a station after playback failure when random is on
     * trying to better VLC start of playback detection
     * last opened playlist will restore station selection or resume playback
     * trying to eliminate crashes when window width gets small
       (like in tilling managers)
     * show correct help page when in online browser
+    * disabling theme editing per (#141)
     * mplayer on Windows: do not fail to start a station
       after astop/start command
     * install.py will always use the requested python version
+    * install.py will use special indication per command line
+      (-sng for --sng-master and -sng-dev for --sng-devel)
     * Windows installation will fail if a dependency fails to install
     * updating docs (adding "Limited display" image")
 

README.html

@@ -142,17 +142,20 @@ <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;">
 
-2021-10-14 s-n-g
+2021-10-20 s-n-g
     * adding check for -p parameter (int)
     * keep looking for a station after playback failure when random is on
     * trying to better VLC start of playback detection
     * last opened playlist will restore station selection or resume playback
     * trying to eliminate crashes when window width gets small
       (like in tilling managers)
     * show correct help page when in online browser
+    * disabling theme editing per (#141)
     * mplayer on Windows: do not fail to start a station
       after astop/start command
     * install.py will always use the requested python version
+    * install.py will use special indication per command line
+      (-sng for --sng-master and -sng-dev for --sng-devel)
     * Windows installation will fail if a dependency fails to install
     * updating docs (adding "Limited display" image")
 

devel/build_install_pyradio

@@ -173,6 +173,18 @@ function do_dev(){
     fi
 }
 
+function do_exit(){
+    # remove instasllation directory
+    if [ ! -z "$REMOVE_DIR" ];then
+        if [ "$REMOVE_DIR" = "$HOME/pyradio" ] || \
+                [ "$REMOVE_DIR" = "$HOME/tmp-pyradio" ] || \
+                [ "$REMOVE_DIR" = "/tmp/pyradio" ] || \
+                [ "$REMOVE_DIR" = "/tmp/tmp-pyradio" ];then
+            sudo rm -fr "$REMOVE_DIR"
+        fi
+    fi
+}
+
 TO_PYTHON=3
 TO_PYTHON_FROM_X=''
 NO_DEV=''
@@ -278,11 +290,15 @@ uninstall 1
 }
 
 # build and install project
-python"${TO_PYTHON}" setup.py build && {
+python"${TO_PYTHON}" setup.py build
+if [ $? -eq 0 ]
+then
     [ -z "$TO_USER" ] && {
         echo "***** installing..."
         do_dev
-        sudo python"${TO_PYTHON}" setup.py install && {
+        sudo python"${TO_PYTHON}" setup.py install
+        if [ $? -eq 0 ]
+        then
             [ -z "${NO_DEV}" ] && mv pyradio/config.py.dev pyradio/config.py
             gzip -k pyradio.1
             sudo mv -f pyradio.1.gz /usr/share/man/man1 2>/dev/null || sudo mv -f pyradio.1.gz /usr/local/share/man/man1
@@ -306,11 +322,16 @@ python"${TO_PYTHON}" setup.py build && {
             else
                 sudo cp LICENCE "$DOC"
             fi
-        }
+        else
+            do_exit
+            exit 1
+        fi
     } || {
         echo "***** installing for user..."
         do_dev
-        python"${TO_PYTHON}" setup.py install --user && {
+        python"${TO_PYTHON}" setup.py install --user
+        if [ $? -eq 0 ]
+        then
             [ -z "${NO_DEV}" ] && mv pyradio/config.py.dev pyradio/config.py
             gzip -k pyradio.1
             gzip -k pyradio_rb.1
@@ -336,17 +357,15 @@ python"${TO_PYTHON}" setup.py build && {
             else
                 cp LICENCE "$DOC"
             fi
-        }
+        else
+            do_exit
+            exit 1
+        fi
     }
-}
-
-# remove instasllation directory
-if [ ! -z "$REMOVE_DIR" ];then
-    if [ "$REMOVE_DIR" = "$HOME/pyradio" ] || \
-            [ "$REMOVE_DIR" = "$HOME/tmp-pyradio" ] || \
-            [ "$REMOVE_DIR" = "/tmp/pyradio" ] || \
-            [ "$REMOVE_DIR" = "/tmp/tmp-pyradio" ];then
-        sudo rm -fr "$REMOVE_DIR"
-    fi
+else
+    do_exit
+    exit 1
 fi
 
+do_exit
+exit 0

devel/build_install_pyradio.bat

@@ -127,33 +127,42 @@ FOR /R .\... %%f in (*.pyc) DO DEL /q "%%~ff"
 
 
 IF "%NO_DEV%" == "1" (
-	CD pyradio
-	%PROGRAM% -c "from install import windows_put_devel_version; windows_put_devel_version()"
-	cd ..
+    CD pyradio
+    %PROGRAM% -c "from install import windows_put_devel_version; windows_put_devel_version()"
+    cd ..
 )
 %PROGRAM% setup.py build
 IF %ERRORLEVEL% == 0 GOTO install
+ECHO.
+ECHO.
+ECHO ###############################################
+ECHO # The installation has failed!                #
+ECHO #                                             #
+ECHO # Please make sure your internet connection   #
+ECHO # is working and try again.                   #
+ECHO ###############################################
 GOTO endofscript
 
 :install
 %PROGRAM% setup.py install
 IF %ERRORLEVEL% == 0 GOTO installhtml
+:installationerror
 ECHO.
 ECHO.
 ECHO ###############################################
 ECHO # The installation has failed!                #
 ECHO #                                             #
 ECHO # This is probably because PyRadio is already #
-ECHO # running, so files canNOT be overwritten.    #
+ECHO # running, so files cannot be overwritten.    #
 ECHO # Please terminate PyRadio and try again.     #
 ECHO ###############################################
 GOTO endofscript
 
 :installhtml
 IF "%NO_DEV%"=="1" (
     DEL DEV
-    cd pyradio
-    DELETE config.py
+    CD pyradio
+    DEL config.py
     RENAME config.py.dev config.py
     CD ..
 )
@@ -176,11 +185,15 @@ GOTO toend
 CLS
 ECHO  The installation has failed
 ECHO.
-ECHO  One of PyRadio's dependencies has not been found
+ECHO This means that either you internet connection
+ECHO has failed (in which case you should fix it and
+ECHO try again), or that
+ECHO.
+ECHO one of PyRadio's dependencies has not been found
 ECHO(     package: !ERRPKG!
 ECHO.
-ECHO  This means that packagers have not yet produced a
-ECHO  package for this version of python (it was
+ECHO  If this is the case, packagers have not yet produced
+ECHO  a package for this version of python (it was
 ECHO  probably released recently).
 ECHO.
 ECHO  What can you do?

pyradio/install.py

@@ -111,15 +111,21 @@ def version_string_to_list(this_version):
     while len(a_l) < 4:
         a_l.append('0')
     a_n_l = []
-    for n in a_l:
+    # logger.error('DE a_n_l = "{}"'.format(a_n_l))
+    for i, n in enumerate(a_l):
         if 'beta' in n:
             a_n_l.append(-200+int(a_l[-1].replace('beta', '')))
         elif 'rc' in n:
             a_n_l.append(-100+int(a_l[-1].replace('rc', '')))
         elif 'r' in n:
             pass
         else:
-            a_n_l.append(int(n))
+            if len(n) < 4 and i > 0:
+                try:
+                    a_n_l.append(int(n))
+                except ValueError:
+                    pass
+        # logger.error('DE a_n_l = "{}"'.format(a_n_l))
     return a_n_l
 
 def get_github_long_description(
@@ -492,7 +498,6 @@ def update_or_uninstall_on_windows(self, mode='update'):
             sys.exit(1)
 
         if mode.endswith('-open'):
-            print('---------------------')
             os.startfile(self._dir)
 
     def open_windows_dir(self):
@@ -599,10 +604,20 @@ def _download_pyradio(self):
             get new install.py, copy.py (any py)
             into downloaded directory
         '''
-        # from shutil import copyfile
-        # cur_dir = os.getcwd()
-        # copyfile('/home/spiros/projects/my-gits/pyradio/pyradio/install.py', os.path.join(cur_dir, 'install.py'))
-        # copyfile('/home/spiros/projects/my-gits/pyradio/pyradio/config.py', os.path.join(cur_dir, 'config.py'))
+        '''
+        from shutil import copyfile
+        cur_dir = os.getcwd()
+        print('\n\n{}\n\n'.format(os.path.join(self._dir, self.ZIP_DIR[self._package])))
+        print(cur_dir)
+        copyfile('/home/spiros/projects/my-gits/pyradio/pyradio/install.py',
+            os.path.join(cur_dir, 'install.py'))
+        copyfile('/home/spiros/projects/my-gits/pyradio/devel/build_install_pyradio', \
+            os.path.join(os.path.join(self._dir, self.ZIP_DIR[self._package],
+                'devel', 'build_install_pyradio'))
+        )
+        # copyfile('/home/spiros/projects/my-gits/pyradio/pyradio/config.py',
+        #    os.path.join(self._dir, self.ZIP_DIR[self._package], 'pyradio', 'config.py'))
+        '''
 
     def _mkdir(self, name, dir_exist_function=None, _permission_error_function=None):
         if os.path.isdir(name):

pyradio/radio.py

@@ -3797,10 +3797,10 @@ def to_time(secs):
                     logger.debug('detectUpdateThread: Asked to stop. Stoping...')
                 break
 
-            logger.error('DE last_tag = "{}"'.format(last_tag))
+            # logger.error('DE last_tag = "{}"'.format(last_tag))
             if self._force_update:
                 last_tag = self._force_update
-            logger.error('DE last_tag = "{}"'.format(last_tag))
+            # logger.error('DE last_tag = "{}"'.format(last_tag))
 
             if last_tag:
                 connection_fail_count = 0
@@ -3813,7 +3813,6 @@ def to_time(secs):
                         logger.info('detectUpdateThread: No update found. Will check again in {} days. Terminating...'.format(check_days))
                     break
                 else:
-                    logger.error('DE 1 this_version = {}'.format(this_version))
                     existing_version = version_string_to_list(this_version)
                     new_version = version_string_to_list(last_tag)
                     if logger.isEnabledFor(logging.DEBUG):