diff --git a/python_apps/pypo/liquidsoap/__main__.py b/python_apps/pypo/liquidsoap/__main__.py index 70207f888..af8145a79 100644 --- a/python_apps/pypo/liquidsoap/__main__.py +++ b/python_apps/pypo/liquidsoap/__main__.py @@ -7,10 +7,11 @@ import logging import subprocess from pypo import pure -PYPO_HOME = '/var/tmp/airtime/pypo/' +PYPO_HOME = "/var/tmp/airtime/pypo/" + def run(): - '''Entry-point for this application''' + """Entry-point for this application""" print("Airtime Liquidsoap") parser = argparse.ArgumentParser() parser.add_argument("-d", "--debug", help="run in debug mode", action="store_true") @@ -19,15 +20,29 @@ def run(): os.environ["HOME"] = PYPO_HOME if args.debug: - logging.basicConfig(level=getattr(logging, 'DEBUG', None)) + logging.basicConfig(level=getattr(logging, "DEBUG", None)) generate_liquidsoap_cfg.run() - ''' check liquidsoap version so we can run a scripts matching the liquidsoap minor version ''' - liquidsoap_version = subprocess.check_output("liquidsoap --version", shell=True, universal_newlines=True)[0:3] - script_path = os.path.join(os.path.dirname(__file__), liquidsoap_version, 'ls_script.py') + """ check liquidsoap version so we can run a scripts matching the liquidsoap minor version """ + liquidsoap_version = subprocess.check_output( + "liquidsoap --force-start 'print(liquidsoap.version) shutdown()'", + shell=True, + universal_newlines=True, + )[0:3] + script_path = os.path.join( + os.path.dirname(__file__), liquidsoap_version, "ls_script.liq" + ) + exec_args = [ + "/usr/bin/liquidsoap", + "airtime-liquidsoap", + script_path, + "--verbose", + "-f", + ] if args.debug: - os.execl('/usr/bin/liquidsoap', 'airtime-liquidsoap', script_path, '--verbose', '-f', '--debug') - else: - os.execl('/usr/bin/liquidsoap', 'airtime-liquidsoap', script_path, '--verbose', '-f') + print(f"Liquidsoap {liquidsoap_version} using script: {script_path}") + exec_args.append("--debug") + os.execl(*exec_args) + run()