From b992801a450dae5337b7a4fd27d0f3994c12ff30 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 15 Apr 2011 12:11:06 -0400 Subject: [PATCH 1/7] hiding/showing show overflow message properly. --- .../schedule/schedule-show-dialog.phtml | 2 +- .../public/js/airtime/schedule/schedule.js | 28 +++++++++++++------ 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml b/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml index c0a28a984..2085d67e9 100644 --- a/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml +++ b/airtime_mvc/application/views/scripts/schedule/schedule-show-dialog.phtml @@ -28,7 +28,7 @@
showLength; ?> -
+ diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index 40a56a68c..85c7dd34c 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -9,6 +9,22 @@ function closeDialog(event, ui) { $(this).remove(); } +function checkShowLength() { + var showFilled = $("#show_time_filled").text().split('.')[0]; + var showLength = $("#show_length").text(); + + if (showFilled > showLength){ + $("#show_time_warning") + .text("Shows longer than their scheduled time will be cut off by a following show.") + .show(); + } + else { + $("#show_time_warning") + .empty() + .hide(); + } +} + function setScheduleDialogHtml(json) { var dt; @@ -23,14 +39,7 @@ function setScheduleDialogHtml(json) { $("#show_time_filled").empty().append(json.timeFilled); $("#show_progressbar").progressbar( "value" , json.percentFilled ); - var showFilled = $("#show_time_filled").text().split('.')[0]; - var showLength = $("#show_length").text(); - - if (showFilled > showLength){ - $("#show_time_warning").text("Shows longer than their scheduled time will be cut off by a following show."); - } else { - $("#show_time_warning").empty(); - } + checkShowLength(); } function setScheduleDialogEvents(dialog) { @@ -221,7 +230,7 @@ function buildScheduleDialog(json){ autoOpen: false, title: 'Schedule Playlist', width: 1100, - height: 500, + height: 550, modal: true, close: closeDialog, buttons: {"Ok": function() { @@ -231,6 +240,7 @@ function buildScheduleDialog(json){ }); dialog.dialog('open'); + checkShowLength(); } function buildEditDialog(json){ From 4814d90824560e72a24ca1255c038a3e2ba7d26b Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 15 Apr 2011 12:14:49 -0400 Subject: [PATCH 2/7] CC-2157 : Enable OGG streams by default, not MP3, due to lame distribution problems --- python_apps/pypo/scripts/liquidsoap.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python_apps/pypo/scripts/liquidsoap.cfg b/python_apps/pypo/scripts/liquidsoap.cfg index 467ece4d1..360ee107f 100644 --- a/python_apps/pypo/scripts/liquidsoap.cfg +++ b/python_apps/pypo/scripts/liquidsoap.cfg @@ -34,5 +34,5 @@ icecast_genre = "genre" #liquidsoap output settings # ########################################### output_sound_device = false -output_icecast_vorbis = false -output_icecast_mp3 = true +output_icecast_vorbis = true +output_icecast_mp3 = false From e48f044e5628e1d7eb3d3a60ada32c1bb7f451dd Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 15 Apr 2011 12:26:59 -0400 Subject: [PATCH 3/7] -CC-2192: Schedule sent to pypo is not sorted by start time. --- airtime_mvc/application/models/Schedule.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Schedule.php b/airtime_mvc/application/models/Schedule.php index 4f2b4cd8d..4d68df7b3 100644 --- a/airtime_mvc/application/models/Schedule.php +++ b/airtime_mvc/application/models/Schedule.php @@ -190,7 +190,8 @@ class ScheduleGroup { ." LEFT JOIN $CC_CONFIG[showInstances] as si" ." ON st.instance_id = si.id" ." WHERE st.group_id=$this->groupId" - ." AND st.starts < si.ends"; + ." AND st.starts < si.ends" + ." ORDER BY st.starts"; return $CC_DBC->GetAll($sql); } From 6db16bc6d11f34626babca0f5a77041028d0db2a Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 15 Apr 2011 12:27:25 -0400 Subject: [PATCH 4/7] -update paths logs for utils in dev_tools/ --- dev_tools/pl.sh | 2 +- dev_tools/pr.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_tools/pl.sh b/dev_tools/pl.sh index 4e1c70134..9d3729e15 100755 --- a/dev_tools/pl.sh +++ b/dev_tools/pl.sh @@ -2,4 +2,4 @@ echo echo "This will tail the pypo-liquidsoap log file." echo "Type in password for pypo user (default password is 'pypo'):" -su -l pypo -c "tail -F /etc/service/pypo-liquidsoap/log/main/current" +su -l pypo -c "tail -F /var/log/airtime/pypo-liquidsoap/main/current" diff --git a/dev_tools/pr.sh b/dev_tools/pr.sh index aadab42ec..9734704b8 100755 --- a/dev_tools/pr.sh +++ b/dev_tools/pr.sh @@ -4,4 +4,4 @@ echo echo "This will tail the recorder log file." echo "Type in password for pypo user (default password is 'pypo'):" -su -l pypo -c "tail -F /etc/service/recorder/log/main/current" +su -l pypo -c "tail -F /var/log/airtime/recorder/log/main/current" From 0320c9a1367b4922a7657968342ee692091cd925 Mon Sep 17 00:00:00 2001 From: martin Date: Fri, 15 Apr 2011 12:35:57 -0400 Subject: [PATCH 5/7] -fix to dev_tools/pr.sh path --- dev_tools/pr.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev_tools/pr.sh b/dev_tools/pr.sh index 9734704b8..42a0aa669 100755 --- a/dev_tools/pr.sh +++ b/dev_tools/pr.sh @@ -4,4 +4,4 @@ echo echo "This will tail the recorder log file." echo "Type in password for pypo user (default password is 'pypo'):" -su -l pypo -c "tail -F /var/log/airtime/recorder/log/main/current" +su -l pypo -c "tail -F /var/log/airtime/recorder/main/current" From 428357e5f83583856543cf2f55220e2b60a74c57 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 15 Apr 2011 12:37:30 -0400 Subject: [PATCH 6/7] changing include paths for new folder structure. --- install/airtime-upgrade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index b1dda7246..f5f8ccc62 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -7,8 +7,8 @@ */ require_once(dirname(__FILE__).'/include/AirtimeIni.php'); -set_include_path(__DIR__.'/../library' . PATH_SEPARATOR . get_include_path()); -require_once __DIR__.'/../application/configs/conf.php'; +set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); +require_once __DIR__.'/../airtime_mvc/application/configs/conf.php'; require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); AirtimeIni::ExitIfNotRoot(); From dfa508a9eabd19597a18791c0547a2fbb9811ddc Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 15 Apr 2011 13:25:52 -0400 Subject: [PATCH 7/7] changing paths with new folder structure --- install/airtime-upgrade.php | 8 +++++++- install/upgrades/airtime-1.8/airtime-upgrade.php | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php index f5f8ccc62..c1c6436fa 100644 --- a/install/airtime-upgrade.php +++ b/install/airtime-upgrade.php @@ -11,7 +11,7 @@ set_include_path(__DIR__.'/../airtime_mvc/library' . PATH_SEPARATOR . get_includ require_once __DIR__.'/../airtime_mvc/application/configs/conf.php'; require_once(dirname(__FILE__).'/include/AirtimeInstall.php'); -AirtimeIni::ExitIfNotRoot(); +AirtimeInstall::ExitIfNotRoot(); AirtimeInstall::DbConnect(true); if(AirtimeInstall::DbTableExists('cc_show_rebroadcast') === true) { @@ -34,6 +34,12 @@ if(strcmp($version, "1.8.0") < 0) { AirtimeInstall::SetAirtimeVersion(AIRTIME_VERSION); +echo PHP_EOL."*** Updating Pypo ***".PHP_EOL; +system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py"); + +echo PHP_EOL."*** Updating Recorder ***".PHP_EOL; +system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py"); + echo "******************************* Update Complete *******************************".PHP_EOL; diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php index fdf79bdec..0b05e1c41 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -6,8 +6,8 @@ * @license http://www.gnu.org/licenses/gpl.txt */ -set_include_path(__DIR__.'/../../../library' . PATH_SEPARATOR . get_include_path()); -require_once __DIR__.'/../../../application/configs/conf.php'; +set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); +require_once __DIR__.'/../../../airtime_mvc/application/configs/conf.php'; require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); AirtimeInstall::DbConnect(true);