From 68c401b2964c686a1a955191bdbdbc2e6b379bf7 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 13 Aug 2012 11:04:21 -0400 Subject: [PATCH 1/3] airtime-check-system not using user define port in all cases --- utils/airtime-check-system.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/utils/airtime-check-system.php b/utils/airtime-check-system.php index 22ff7362c..fa244f3b3 100644 --- a/utils/airtime-check-system.php +++ b/utils/airtime-check-system.php @@ -17,7 +17,7 @@ if (substr($sapi_type, 0, 3) == 'cli') { $status = AirtimeCheck::GetStatus($baseUrl, $base_port, $apiKey); - AirtimeCheck::PrintStatus($baseUrl, $status); + AirtimeCheck::PrintStatus($baseUrl, $base_port, $status); } class AirtimeCheck { @@ -92,8 +92,9 @@ class AirtimeCheck { return $os_string." ".$machine; } - public static function GetServerType($p_baseUrl){ - $headerInfo = get_headers("http://$p_baseUrl",1); + public static function GetServerType($p_baseUrl, $p_basePort) + { + $headerInfo = get_headers("http://$p_baseUrl:$p_basePort",1); if (!isset($headerInfo['Server'][0])) return self::UNKNOWN; @@ -120,7 +121,7 @@ class AirtimeCheck { return $data; } - public static function PrintStatus($p_baseUrl, $p_status){ + public static function PrintStatus($p_baseUrl, $p_basePort, $p_status){ if ($p_status === false){ self::output_status("AIRTIME_SERVER_RESPONDING", "FAILED"); @@ -150,7 +151,7 @@ class AirtimeCheck { } self::output_status("OS", self::CheckOsTypeVersion()); self::output_status("CPU", self::GetCpuInfo()); - self::output_status("WEB_SERVER", self::GetServerType($p_baseUrl)); + self::output_status("WEB_SERVER", self::GetServerType($p_baseUrl, $p_basePort)); if (isset($data->services)) { $services = $data->services; From 831a1b192315ef7a957849cd4a03eab702a8c7ed Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 16 Aug 2012 23:49:37 -0400 Subject: [PATCH 2/3] CC-4242: MP3 streams have the artist name duplicated -fixed --- python_apps/pypo/liquidsoap_scripts/ls_lib.liq | 6 +++--- python_apps/pypo/liquidsoap_scripts/ls_script.liq | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq index 83ab39322..78854f07d 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_lib.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_lib.liq @@ -7,11 +7,11 @@ end def append_title(m) = log("Using stream_format #{!stream_metadata_type}") if !stream_metadata_type == 1 then - [("artist","#{!show_name} - #{m['artist']}")] + [("title", "#{!show_name} - #{m['artist']}")] elsif !stream_metadata_type == 2 then - [("artist",!station_name), ("title", !show_name)] + [("title", "#{!station_name} - #{!show_name}")] else - [] + [("title", "#{m['artist']} - #{m['title']}")] end end diff --git a/python_apps/pypo/liquidsoap_scripts/ls_script.liq b/python_apps/pypo/liquidsoap_scripts/ls_script.liq index 482a60a5e..dabd164a7 100644 --- a/python_apps/pypo/liquidsoap_scripts/ls_script.liq +++ b/python_apps/pypo/liquidsoap_scripts/ls_script.liq @@ -29,7 +29,7 @@ just_switched = ref false %include "ls_lib.liq" queue = on_metadata(notify, queue) -queue = map_metadata(append_title, queue) +queue = map_metadata(update=false, append_title, queue) # the crossfade function controls fade in/out queue = crossfade(queue) ignore(output.dummy(queue, fallible=true)) From 2a497bf941ef68ee9c7ee9c712d198b9f82e97fb Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Tue, 21 Aug 2012 12:06:07 -0400 Subject: [PATCH 3/3] remove symlink, not actual binary --- python_apps/pypo/install/pypo-initialize.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py index 357aa49c6..01fe004bb 100644 --- a/python_apps/pypo/install/pypo-initialize.py +++ b/python_apps/pypo/install/pypo-initialize.py @@ -85,16 +85,16 @@ try: p = Popen("which liquidsoap", shell=True, stdout=PIPE) liq_path = p.communicate()[0].strip() + symlink_path = "/usr/bin/airtime-liquidsoap" if p.returncode == 0: try: - os.unlink(liq_path) + os.remove(symlink_path) except Exception: #liq_path DNE, which is OK. pass - - os.symlink(liq_path, "/usr/bin/airtime-liquidsoap") + os.symlink(liq_path, symlink_path) else: print " * Liquidsoap binary not found!" sys.exit(1)