- starting 0.8.8-bate4

- build script will use Python 3  by default
- using contextmanager to deal with the lock file

Author: s-n-g

Changelog

@@ -1,3 +1,6 @@
+2020-11-05
+    * Installation script will use Python 3 by default
+
 2020-10-30 s-n-g
     * Version 0.8.8-beta3
     * Re-implementing status bar output function

Makefile

@@ -3,13 +3,25 @@ SPHINXBUILD=sphinx-build
 ALLSPHINXOPTS= -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
 BUILDDIR=_build
 
+.PHONY: build
+build:
+	python3 setup.py build
+
+.PHONY: install
+install:
+	devel/build_install_pyradio 3
+
+.PHONY: uninstall
+uninstall:
+	devel/build_install_pyradio -u
 
 .PHONY: clean
 clean:
-	rm -rf build dist docs/_build
-	find . -name "*.pyc" -delete
-	find . -name "*.orig" -delete
-	find . -name "*.log" -delete
+	sudo rm -rf build dist docs/_build
+	sudo find . -name "*.pyc" -delete
+	sudo find . -name "*.orig" -delete
+	sudo find . -name "*.log" -delete
+	sudo find . -name "*.1.gz" -delete
 
 .PHONY: register
 register:

devel/build_install_pyradio

@@ -1,22 +1,21 @@
 #!/bin/bash
 function help(){
 if [[ $(uname -s) = "Darwin" ]] || [[ $(uname -s) = "darwin" ]]; then
-    echo "Usage: $0 [2/3/-u]"
+    echo "Usage: $0 [2/-u]"
 else
-    echo "Usage: $0 [2/3/-u/--user]"
+    echo "Usage: $0 [2/-u/--user]"
 fi
 echo "
 Available options:
-  2       build using python v. 2.x
-  3       build using python v. 3.x
-  -u      uninstall pyradio
-  --user  user install (in ~/.local)
+       2   build using python v. 2.x
+      -u   uninstall pyradio
+  --user   user install (in ~/.local)
 
-If no option is used, will build using system default
+If no option is used, will build using Python 3
 
 Checking python availability:"
 
-            for n in "" 2 3;do
+            for n in 2 3 "";do
                 echo -n "  python${n}"
                 [ -z "$n" ] && echo -n " "
                 echo -n "   ...   "
@@ -97,6 +96,69 @@ function uninstall(){
     echo "PyRadio successfully uninstalled"
 }
 
+function create_bdist(){
+    rm -rf build pyradio.egg-info dist debian 2>/dev/null
+    python3 setup.py bdist || {
+        echo "Error creating bdist"
+        exit 1
+    }
+
+}
+
+function get_cur_version(){
+    cur_version=$(grep 'version_info = ' pyradio/__init__.py | sed 's/version_info = (//;s/, /./g;s/)//')
+    cur_state=$(grep 'app_state = ' pyradio/__init__.py | sed "s/app_state = //;s/'//g")
+    [[ -z "$cur_state" ]] || cur_version="$cur_version"-"$cur_state"
+    #echo "$cur_version"
+}
+
+function do_debian(){
+get_cur_version
+outfile=pyradio-${cur_version}_all.deb
+create_bdist
+mkdir -p debian/DEBIAN
+cat <<END >debian/DEBIAN/control
+Source: pyradio
+Version: |version|
+Priority: optional
+Build-Depends: debhelper-compat (= 9) python3-setuptools
+Maintainer: Spiros Georgaras <[email protected]>
+Package: pyradio
+Section: Multimedia
+Architecture: all
+Description: Command line internet radio player
+
+END
+
+
+cd debian
+tar xzf ../dist/*z
+mkdir -p usr/local/share/doc
+cp ../*md usr/local/share/doc
+cp ../*html usr/local/share/doc
+cp ../LICENCE usr/local/share/doc/copyright
+mkdir -p usr/local/share/man/man1
+cp ../pyradio.1 usr/local/share/man/man1/
+gzip usr/local/share/man/man1/pyradio.1
+sed -i "s/|version|/$cur_version/" DEBIAN/control
+cd ..
+
+dpkg-deb -b debian $outfile
+# clean up
+rm -rf build pyradio.egg-info dist debian 2>/dev/null
+echo
+echo "=============================================================================="
+echo "File created: $outfile
+You can install it by executing
+    sudo dpkg -i ./$outfile
+or
+    sudo apt install ./$outfile
+"
+echo "=============================================================================="
+
+}
+
+TO_PYTHON=3
 while [[ $# -gt 0 ]]
 do
     key="$1"
@@ -105,6 +167,10 @@ do
             help
             exit
             ;;
+        -d)
+            do_debian
+            exit
+            ;;
         -u)
             uninstall
             exit
@@ -121,10 +187,6 @@ do
             TO_PYTHON=2
             shift
             ;;
-        3)
-            TO_PYTHON=3
-            shift
-            ;;
         *)    # unknown option
             POSITIONAL+=("$1") # save it in an array for later
             shift # past argument

devel/what_tag

@@ -41,6 +41,13 @@ When ready to push, type
 To delete a this tag, type
     (local)    ${cRed}git tag --delete $final_version${cReset}
     (remote)   ${cRed}git push --delete origin $final_version${cReset}
+
+To update ${cYellow}coderholic${cReset}, type:
+    ${cGreen}git push upstream master${cReset}
+
+Finally, got to ${cRed}~/projects/my-gits/aur/pyragio-git${cReset}
+and execute ${cRed}./add-pkgver${cReset} to get AUR package
+ready for update.
 "
 
 

pyradio/__init__.py

@@ -6,7 +6,7 @@
 # New stable version:  ''
 # Beta version:        'betax', x=1,2,3...
 # RC version:          'RCx', x=1,23...
-app_state = 'beta3'
+app_state = 'beta4'
 
 __version__ = version = '.'.join(map(str, version_info))
 __project__ = __name__

pyradio/config.py

@@ -66,8 +66,6 @@ class PyRadioStations(object):
 
     playlist_recovery_result = 0
 
-    locked = False
-
     _open_string = [ "open(stationFile, 'r')", "open(stationFile, 'r', encoding='utf-8')" ]
     _open_string_id = 0
 
@@ -101,15 +99,6 @@ def __init__(self, stationFile=''):
                     sys.exit(1)
         self.root_path = path.join(path.dirname(__file__), 'stations.csv')
 
-        if path.exists(self._session_lock_file):
-                self.locked = True
-        else:
-            try:
-                with open(self._session_lock_file, 'w') as f:
-                    pass
-            except:
-                pass
-
         self._ps = PyRadioPlaylistStack()
 
         if not self.locked:
@@ -371,7 +360,7 @@ def _get_playlist_abspath_from_data(self, stationFile=''):
                 else:
                     n, f = self.read_playlists()
                     if sel <= n-1:
-                        stationFile=self.playlists[sel][-1]
+                        stationFile = self.playlists[sel][-1]
                         return stationFile, 0
                     else:
                         """ playlist number sel does not exit """
@@ -921,6 +910,9 @@ class PyRadioConfig(PyRadioStations):
     theme_has_error = False
     theme_not_supported_notification_shown = False
 
+    # True if lock file exists
+    locked = False
+
     opts = collections.OrderedDict()
     opts[ 'general_title' ] = [ 'General Options', '' ]
     opts[ 'player' ] = [ 'Player: ', '' ]
@@ -964,6 +956,7 @@ def __init__(self):
 
         self._check_config_file(self.stations_dir)
         self.config_file = path.join(self.stations_dir, 'config')
+        self.force_to_remove_lock_file = False
 
     @property
     def requested_player(self):
@@ -1083,9 +1076,13 @@ def session_lock_file(self, val):
         return
 
     def _get_lock_file(self):
+        ''' Populate self._session_lock_file
+            If it exists, locked becomes True
+            Otherwise, the file is created
+        '''
         if path.exists('/run/user'):
             from os import geteuid
-            self._session_lock_file =  path.join('/run/user', str(geteuid()), 'pyradio.lock')
+            self._session_lock_file = path.join('/run/user', str(geteuid()), 'pyradio.lock')
             # remove old style session lock file (if it exists)
             if path.exists(path.join(self.stations_dir, '.lock')):
                 try:
@@ -1095,22 +1092,35 @@ def _get_lock_file(self):
         else:
             self._session_lock_file =  path.join(self.stations_dir, 'pyradio.lock')
 
-    def remove_session_lock_file(self):
-        #print(self._session_lock_file)
         if path.exists(self._session_lock_file):
+                self.locked = True
+        else:
             try:
-                remove(self._session_lock_file)
-                if logger.isEnabledFor(logging.INFO):
-                    logger.info('Lock file removed...')
-                return 0, self._session_lock_file
+                with open(self._session_lock_file, 'w') as f:
+                    pass
             except:
-                if logger.isEnabledFor(logging.INFO):
-                    logger.info('Failed to remove Lock file...')
-                return 1, self._session_lock_file
-        else:
+                pass
+
+    def remove_session_lock_file(self):
+        ''' remove session lock file, if session is not locked '''
+        if self.locked:
             if logger.isEnabledFor(logging.INFO):
-                logger.info('Lock file not found...')
-            return -1, self._session_lock_file
+                logger.info('Not removing lock file; session is locked...')
+        else:
+            if path.exists(self._session_lock_file):
+                try:
+                    remove(self._session_lock_file)
+                    if logger.isEnabledFor(logging.INFO):
+                        logger.info('Lock file removed...')
+                    return 0, self._session_lock_file
+                except:
+                    if logger.isEnabledFor(logging.INFO):
+                        logger.info('Failed to remove Lock file...')
+                    return 1, self._session_lock_file
+            else:
+                if logger.isEnabledFor(logging.INFO):
+                    logger.info('Lock file not found...')
+                return -1, self._session_lock_file
 
     def _check_config_file(self, usr):
         ''' Make sure a config file exists in the config dir '''