From 79141fa070cdcb8a93cb69b91b5e7ff06255dece Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 12 Jan 2012 12:14:38 -0500 Subject: [PATCH 1/5] CC-3240: When playlist is longer than a show, the now playing bar shows as if the playlist is still playing after show ends -Fixed --- airtime_mvc/application/models/Nowplaying.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/airtime_mvc/application/models/Nowplaying.php b/airtime_mvc/application/models/Nowplaying.php index b59bb4e6a..618ae3080 100644 --- a/airtime_mvc/application/models/Nowplaying.php +++ b/airtime_mvc/application/models/Nowplaying.php @@ -27,7 +27,9 @@ class Application_Model_Nowplaying $status = ($dbRow['show_ends'] < $dbRow['item_ends']) ? "x" : ""; $type = "a"; - $type .= ($itemEndDateTime->getTimestamp() > $epochNow && $itemStartDateTime->getTimestamp() <= $epochNow) ? "c" : ""; + $type .= ($itemStartDateTime->getTimestamp() <= $epochNow + && $epochNow < $itemEndDateTime->getTimestamp() + && $epochNow < $showEndDateTime->getTimestamp()) ? "c" : ""; // remove millisecond from the time format $itemStart = explode('.', $dbRow['item_starts']); From 67ddda4a2dd2ee414821a5e5e1834fb4021bc5a5 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 12 Jan 2012 12:16:10 -0500 Subject: [PATCH 2/5] -Remove phing path from conf.php --- airtime_mvc/application/configs/conf.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php index 909ca4fa2..10668cd68 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -19,8 +19,7 @@ $CC_CONFIG = array( "rootDir" => __DIR__."/../..", 'pearPath' => dirname(__FILE__).'/../../library/pear', - 'zendPath' => dirname(__FILE__).'/../../library/Zend', - 'phingPath' => dirname(__FILE__).'/../../library/phing' + 'zendPath' => dirname(__FILE__).'/../../library/Zend' ); From cb3cb5b48cdd96105c18cc3dfcba89f446e793f2 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 12 Jan 2012 13:34:27 -0500 Subject: [PATCH 3/5] CC-3237: Remove phing dependency of end user database installation -Done --- install_minimal/include/AirtimeInstall.php | 15 +++++++++++---- install_minimal/include/airtime-db-install.php | 13 ++++++++++--- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/install_minimal/include/AirtimeInstall.php b/install_minimal/include/AirtimeInstall.php index d101f2e4f..9ba2c58fa 100644 --- a/install_minimal/include/AirtimeInstall.php +++ b/install_minimal/include/AirtimeInstall.php @@ -242,14 +242,21 @@ class AirtimeInstall } } - public static function CreateDatabaseTables() + public static function CreateDatabaseTables($p_dbuser, $p_dbpasswd, $p_dbname, $p_dbhost) { echo " * Creating database tables".PHP_EOL; // Put Propel sql files in Database - //$command = AirtimeInstall::CONF_DIR_WWW."/library/propel/generator/bin/propel-gen ".AirtimeInstall::CONF_DIR_WWW."/build/ insert-sql"; - $command = AirtimeInstall::CONF_DIR_WWW."/library/propel/generator/bin/propel-gen ".AirtimeInstall::CONF_DIR_WWW."/build/ insert-sql 2>/dev/null"; - @exec($command, $output, $results); + //$command = AirtimeInstall::CONF_DIR_WWW."/library/propel/generator/bin/propel-gen ".AirtimeInstall::CONF_DIR_WWW."/build/ insert-sql 2>/dev/null"; + + $dir = AirtimeInstall::CONF_DIR_WWW."/build/sql/"; + $files = array("schema.sql", "sequences.sql", "views.sql", "triggers.sql", "defaultdata.sql"); + + foreach ($files as $f){ + $command = "export PGPASSWORD=$p_dbpasswd && psql --username $p_dbuser --dbname $p_dbname --host $p_dbhost --file $dir$f 2>/dev/null"; + @exec($command, $output, $results); + } + AirtimeInstall::$databaseTablesCreated = true; } diff --git a/install_minimal/include/airtime-db-install.php b/install_minimal/include/airtime-db-install.php index 47162aa47..b582b5f9b 100644 --- a/install_minimal/include/airtime-db-install.php +++ b/install_minimal/include/airtime-db-install.php @@ -23,8 +23,15 @@ AirtimeInstall::DbConnect(true); AirtimeInstall::InstallPostgresScriptingLanguage(); +//Load Database parameters +global $CC_CONFIG; +$dbuser = $CC_CONFIG['dsn']['username']; +$dbpasswd = $CC_CONFIG['dsn']['password']; +$dbname = $CC_CONFIG['dsn']['database']; +$dbhost = $CC_CONFIG['dsn']['hostspec']; + if (isset($argv[1]) && $argv[1] == 'y') { - AirtimeInstall::CreateDatabaseTables(); + AirtimeInstall::CreateDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost); } else if ($databaseExisted) { //Database already exists. Ask the user how they want to //proceed. Warn them that creating the database tables again @@ -36,12 +43,12 @@ if (isset($argv[1]) && $argv[1] == 'y') { $userAnswer = trim(fgets(STDIN)); } if (in_array($userAnswer, array("y", "Y"))) { - AirtimeInstall::CreateDatabaseTables(); + AirtimeInstall::CreateDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost); } } else { //Database was just created, meaning the tables do not //exist. Let's create them. - AirtimeInstall::CreateDatabaseTables(); + AirtimeInstall::CreateDatabaseTables($dbuser, $dbpasswd, $dbname, $dbhost); } echo " * Setting Airtime version".PHP_EOL; From 461044fdd528ce0e7ca8c4bbb7e3d63628433d39 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 12 Jan 2012 14:06:21 -0500 Subject: [PATCH 4/5] re-add required apt repository for debian..not sure why I commented this out. --- dev_tools/fabric/fab_release_test.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev_tools/fabric/fab_release_test.py b/dev_tools/fabric/fab_release_test.py index 9f4840c47..65563b46c 100644 --- a/dev_tools/fabric/fab_release_test.py +++ b/dev_tools/fabric/fab_release_test.py @@ -139,8 +139,8 @@ def create_fresh_os(vm_name, lucid=False, debian=False): #installed before. do_sudo('echo "rabbitmq-server rabbitmq-server/upgrade_previous note" | debconf-set-selections') - #if debian: - #append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True) + if debian: + append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True) def ubuntu_lucid_32(fresh_os=True): if (fresh_os): From e0828c9b82ce0975c76dccb544fdf6bc00a8b94b Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 12 Jan 2012 14:09:39 -0500 Subject: [PATCH 5/5] --force-yes on apt-get for debian's sake. --- dev_tools/fabric/fab_release_test.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev_tools/fabric/fab_release_test.py b/dev_tools/fabric/fab_release_test.py index 65563b46c..201d22196 100644 --- a/dev_tools/fabric/fab_release_test.py +++ b/dev_tools/fabric/fab_release_test.py @@ -51,6 +51,9 @@ def do_local(command, capture=True): sys.exit(1) else: return result + +def pause(): + raw_input("--> Press Enter to continue...") def shutdown(): do_sudo("poweroff") @@ -193,7 +196,7 @@ def airtime_182_tar(): def airtime_18x_tar(root_dir, version): do_sudo('apt-get update') - do_sudo('apt-get install -y tar gzip unzip apache2 php5-pgsql libapache2-mod-php5 ' + \ + do_sudo('apt-get install -y --force-yes tar gzip unzip apache2 php5-pgsql libapache2-mod-php5 ' + \ 'php-pear php5-gd postgresql odbc-postgresql python python-configobj poc-streamer ' + \ 'lame daemontools daemontools-run python-mutagen libsoundtouch-ocaml sudo ' + \ 'libtaglib-ocaml libao-ocaml libmad-ocaml libesd0 icecast2 oggvideotools ' + \