diff --git a/application/views/scripts/schedule/show-content-dialog.phtml b/application/views/scripts/schedule/show-content-dialog.phtml
index 59dab4fbe..4e5aac630 100644
--- a/application/views/scripts/schedule/show-content-dialog.phtml
+++ b/application/views/scripts/schedule/show-content-dialog.phtml
@@ -1,4 +1,5 @@
+
additionalShowInfo; ?>
| Start |
diff --git a/build/airtime.conf b/build/airtime.conf
index e72855457..4cb119e33 100644
--- a/build/airtime.conf
+++ b/build/airtime.conf
@@ -4,6 +4,18 @@ dbname = airtime
dbuser = airtime
dbpass = airtime
+[rabbitmq]
+host = 127.0.0.1
+port = 5672
+user = guest
+password = guest
+vhost = /
+
[general]
api_key = AAA
+webServerUser = www-data
+baseFilesDir = x
+[soundcloud]
+connection_retries = 3
+time_between_retries = 60
diff --git a/build/schema.xml b/build/schema.xml
index f00ad14fb..d08f9387f 100644
--- a/build/schema.xml
+++ b/build/schema.xml
@@ -24,13 +24,6 @@
-
@@ -138,6 +131,7 @@
+
@@ -158,7 +152,7 @@
-
+
@@ -295,45 +289,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/build/sql/schema.sql b/build/sql/schema.sql
index 71ff970ef..6bdc5351d 100644
--- a/build/sql/schema.sql
+++ b/build/sql/schema.sql
@@ -30,27 +30,6 @@ CREATE INDEX "cc_access_parent_idx" ON "cc_access" ("parent");
CREATE INDEX "cc_access_token_idx" ON "cc_access" ("token");
------------------------------------------------------------------------------
--- cc_backup
------------------------------------------------------------------------------
-
-DROP TABLE "cc_backup" CASCADE;
-
-
-CREATE TABLE "cc_backup"
-(
- "token" VARCHAR(64) NOT NULL,
- "sessionid" VARCHAR(64) NOT NULL,
- "status" VARCHAR(32) NOT NULL,
- "fromtime" TIMESTAMP NOT NULL,
- "totime" TIMESTAMP NOT NULL,
- PRIMARY KEY ("token")
-);
-
-COMMENT ON TABLE "cc_backup" IS '';
-
-
-SET search_path TO public;
-----------------------------------------------------------------------------
-- cc_files
-----------------------------------------------------------------------------
@@ -190,6 +169,7 @@ CREATE TABLE "cc_show_instances"
"rebroadcast" INT2 default 0,
"instance_id" INTEGER,
"file_id" INTEGER,
+ "soundcloud_id" INTEGER,
PRIMARY KEY ("id")
);
@@ -215,7 +195,7 @@ CREATE TABLE "cc_show_days"
"repeat_type" INT2 NOT NULL,
"next_pop_date" DATE,
"show_id" INTEGER NOT NULL,
- "record" INT2,
+ "record" INT2 default 0,
PRIMARY KEY ("id")
);
@@ -440,53 +420,6 @@ COMMENT ON TABLE "cc_subjs" IS '';
SET search_path TO public;
------------------------------------------------------------------------------
--- cc_trans
------------------------------------------------------------------------------
-
-DROP TABLE "cc_trans" CASCADE;
-
-
-CREATE TABLE "cc_trans"
-(
- "id" serial NOT NULL,
- "trtok" CHAR(16) NOT NULL,
- "direction" VARCHAR(128) NOT NULL,
- "state" VARCHAR(128) NOT NULL,
- "trtype" VARCHAR(128) NOT NULL,
- "lock" CHAR(1) default 'N' NOT NULL,
- "target" VARCHAR(255),
- "rtrtok" CHAR(16),
- "mdtrtok" CHAR(16),
- "gunid" CHAR(32),
- "pdtoken" INT8,
- "url" VARCHAR(255),
- "localfile" VARCHAR(255),
- "fname" VARCHAR(255),
- "title" VARCHAR(255),
- "expectedsum" CHAR(32),
- "realsum" CHAR(32),
- "expectedsize" INTEGER,
- "realsize" INTEGER,
- "uid" INTEGER,
- "errmsg" VARCHAR(255),
- "jobpid" INTEGER,
- "start" TIMESTAMP,
- "ts" TIMESTAMP,
- PRIMARY KEY ("id"),
- CONSTRAINT "cc_trans_id_idx" UNIQUE ("id"),
- CONSTRAINT "cc_trans_token_idx" UNIQUE ("pdtoken"),
- CONSTRAINT "cc_trans_trtok_idx" UNIQUE ("trtok")
-);
-
-COMMENT ON TABLE "cc_trans" IS '';
-
-
-SET search_path TO public;
-CREATE INDEX "cc_trans_gunid_idx" ON "cc_trans" ("gunid");
-
-CREATE INDEX "cc_trans_state_idx" ON "cc_trans" ("state");
-
ALTER TABLE "cc_access" ADD CONSTRAINT "cc_access_owner_fkey" FOREIGN KEY ("owner") REFERENCES "cc_subjs" ("id");
ALTER TABLE "cc_files" ADD CONSTRAINT "cc_files_editedby_fkey" FOREIGN KEY ("editedby") REFERENCES "cc_subjs" ("id");
diff --git a/dev_tools/pl.sh b/dev_tools/pl.sh
index 7c6f8b650..4e1c70134 100755
--- a/dev_tools/pl.sh
+++ b/dev_tools/pl.sh
@@ -1,3 +1,5 @@
#!/bin/sh
-
+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"
diff --git a/dev_tools/pr.sh b/dev_tools/pr.sh
index f5e741658..aadab42ec 100755
--- a/dev_tools/pr.sh
+++ b/dev_tools/pr.sh
@@ -1,3 +1,7 @@
#!/bin/sh
+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"
diff --git a/dev_tools/pypoless.sh b/dev_tools/pypoless.sh
index 542702527..f9db223af 100755
--- a/dev_tools/pypoless.sh
+++ b/dev_tools/pypoless.sh
@@ -1,3 +1,7 @@
#!/bin/sh
+echo
+echo "This will output the pypo log file."
+echo "Type in password for pypo user (default password is 'pypo'):"
+
su -l pypo -c "less /etc/service/pypo/log/main/current"
diff --git a/dev_tools/pypotail.sh b/dev_tools/pypotail.sh
index e91cd3917..0f2168e44 100755
--- a/dev_tools/pypotail.sh
+++ b/dev_tools/pypotail.sh
@@ -1,3 +1,7 @@
#!/bin/sh
+echo
+echo "This will tail the pypo log file."
+echo "Type in password for pypo user (default password is 'pypo'):"
+
su -l pypo -c "tail -F /etc/service/pypo/log/main/current"
diff --git a/install/DoctrineMigrations/Version20110308003959.php b/install/DoctrineMigrations/Version20110308003959.php
deleted file mode 100644
index 41f7199b5..000000000
--- a/install/DoctrineMigrations/Version20110308003959.php
+++ /dev/null
@@ -1,21 +0,0 @@
-getTable("cc_show_instances");
- $table->addColumn("record", "boolean", array( 'notnull' => 0, 'default' => 0));
- }
-
- public function down(Schema $schema)
- {
- $table = $schema->getTable("cc_show_instances");
- $table->dropColumn("record");
- }
-}
diff --git a/install/DoctrineMigrations/Version20110331111708.php b/install/DoctrineMigrations/Version20110331111708.php
new file mode 100644
index 000000000..d355566a9
--- /dev/null
+++ b/install/DoctrineMigrations/Version20110331111708.php
@@ -0,0 +1,96 @@
+getTable('cc_show_instances');
+
+ $show_instances_table->addColumn('record', 'smallint', array('notnull' => 0, 'default' => 0));
+ $show_instances_table->addColumn('rebroadcast', 'smallint', array('notnull' => 0, 'default' => 0));
+ $show_instances_table->addColumn('instance_id', 'integer', array('notnull' => 0));
+ $show_instances_table->addColumn('file_id', 'integer', array('notnull' => 0));
+ $show_instances_table->addColumn('soundcloud_id', 'integer', array('notnull' => 0));
+
+ $show_instances_table->addNamedForeignKeyConstraint('cc_original_show_instance_fkey', $show_instances_table, array('instance_id'), array('id'), array('onDelete' => 'CASCADE'));
+
+ $files_table = $schema->getTable('cc_files');
+ $show_instances_table->addNamedForeignKeyConstraint('cc_recorded_file_fkey', $files_table, array('file_id'), array('id'), array('onDelete' => 'CASCADE'));
+ //end cc_show_instances modifications
+
+ //start cc_show_days modifications
+ $show_days_table = $schema->getTable('cc_show_days');
+
+ $show_days_table->addColumn('record', 'smallint', array( 'notnull' => 0, 'default' => 0));
+ //end cc_show_days modifications
+
+ //start cc_show modifications
+ $show_table = $schema->getTable('cc_show');
+
+ $show_table->addColumn('url', 'string', array('notnull' => 0, 'length' => 255));
+ //end cc_show modifications
+
+ //start cc_schedule modifications
+ $schedule_table = $schema->getTable('cc_schedule');
+
+ $playlist_id_col = $schedule_table->getColumn('playlist_id');
+ $playlist_id_col->setNotnull(false);
+ //end cc_schedule modifications
+
+ //create cc_show_rebroadcast table
+ $cc_show_rebroadcast_table = $schema->createTable('cc_show_rebroadcast');
+
+ $cc_show_rebroadcast_table->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+ $cc_show_rebroadcast_table->addColumn('day_offset', 'string', array('length' => 255));
+ $cc_show_rebroadcast_table->addColumn('start_time', 'datetime', array('notnull' => 1));
+ $cc_show_rebroadcast_table->addColumn('show_id', 'integer', array('notnull' => 1));
+
+ $cc_show_rebroadcast_table->setPrimaryKey(array('id'));
+ //end create cc_show_rebroadcast table
+ }
+
+ public function down(Schema $schema)
+ {
+ //start cc_show_instances modifications
+ $show_instances_table = $schema->getTable('cc_show_instances');
+
+ $show_instances_table->dropColumn('record');
+ $show_instances_table->dropColumn('rebroadcast');
+ $show_instances_table->dropColumn('instance_id');
+ $show_instances_table->dropColumn('file_id');
+ $show_instances_table->dropColumn('soundcloud_id');
+ //end cc_show_instances modifications
+
+ //start cc_show_days modifications
+ $show_days_table = $schema->getTable('cc_show_days');
+
+ $show_days_table->dropColumn('record');
+ //end cc_show_days modifications
+
+ //start cc_show modifications
+ $show_table = $schema->getTable('cc_show');
+
+ $show_table->dropColumn('url');
+ //end cc_show modifications
+
+ //start cc_schedule modifications
+ $schedule_table = $schema->getTable('cc_schedule');
+
+ $playlist_id_col = $schedule_table->getColumn('playlist_id');
+ $playlist_id_col->setNotnull(true);
+ //end cc_schedule modifications
+
+ //drop cc_show_rebroadcast table
+ $schema->dropTable('cc_show_rebroadcast');
+ //end drop cc_show_rebroadcast table
+ }
+}
diff --git a/install/airtime-install.php b/install/airtime-install.php
index 1d350f1e1..8b203f6df 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -5,56 +5,47 @@
* @license http://www.gnu.org/licenses/gpl.txt
*/
-// Do not allow remote execution
-$arr = array_diff_assoc($_SERVER, $_ENV);
-if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
- header("HTTP/1.1 400");
- header("Content-type: text/plain; charset=UTF-8");
- echo "400 Not executable\r\n";
- exit(1);
-}
-
-require_once(dirname(__FILE__).'/../application/configs/conf.php');
-require_once(dirname(__FILE__).'/installInit.php');
-
echo "******************************** Install Begin *********************************".PHP_EOL;
-AirtimeInstall::ExitIfNotRoot();
-AirtimeInstall::CreateApiKey();
-AirtimeInstall::UpdateIniValue('../build/build.properties', 'project.home', realpath(__dir__.'/../'));
+require_once(dirname(__FILE__).'/include/AirtimeIni.php');
+AirtimeIni::ExitIfNotRoot();
+AirtimeIni::CreateIniFile();
+AirtimeIni::UpdateIniFiles();
+
+require_once(dirname(__FILE__).'/../application/configs/conf.php');
+require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
+
+echo PHP_EOL."*** Installing Airtime ".AIRTIME_VERSION." ***".PHP_EOL;
echo PHP_EOL."*** Database Installation ***".PHP_EOL;
-echo "* Creating Airtime Database User".PHP_EOL;
+echo "* Creating Airtime database user".PHP_EOL;
AirtimeInstall::CreateDatabaseUser();
-echo "* Creating Airtime Database".PHP_EOL;
+echo "* Creating Airtime database".PHP_EOL;
AirtimeInstall::CreateDatabase();
AirtimeInstall::DbConnect(true);
-echo "* Install Postgresql Scripting Language".PHP_EOL;
+echo "* Installing Postgresql scripting language".PHP_EOL;
AirtimeInstall::InstallPostgresScriptingLanguage();
-echo "* Creating Database Tables".PHP_EOL;
+echo "* Creating database tables".PHP_EOL;
AirtimeInstall::CreateDatabaseTables();
-echo "* Storage Directory Setup".PHP_EOL;
+echo "* Storage directory setup".PHP_EOL;
AirtimeInstall::SetupStorageDirectory($CC_CONFIG);
-echo "* Setting Dir Permissions".PHP_EOL;
+echo "* Giving Apache permission to access the storage directory".PHP_EOL;
AirtimeInstall::ChangeDirOwnerToWebserver($CC_CONFIG["storageDir"]);
echo "* Creating /usr/bin symlinks".PHP_EOL;
AirtimeInstall::CreateSymlinks($CC_CONFIG["storageDir"]);
-echo "* Importing Sample Audio Clips".PHP_EOL;
+echo "* Importing sample audio clips".PHP_EOL;
system(__DIR__."/../utils/airtime-import --copy ../audio_samples/ > /dev/null");
-echo "* Python eggs Setup".PHP_EOL;
-AirtimeInstall::SetUpPythonEggs();
-
echo PHP_EOL."*** Pypo Installation ***".PHP_EOL;
system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
diff --git a/install/airtime-uninstall.php b/install/airtime-uninstall.php
index 5b9a58c3a..7accac35f 100644
--- a/install/airtime-uninstall.php
+++ b/install/airtime-uninstall.php
@@ -5,23 +5,18 @@
* @license http://www.gnu.org/licenses/gpl.txt
*/
-// Do not allow remote execution.
-$arr = array_diff_assoc($_SERVER, $_ENV);
-if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
- header("HTTP/1.1 400");
- header("Content-type: text/plain; charset=UTF-8");
- echo "400 Not executable".PHP_EOL;
- exit;
-}
+require_once(dirname(__FILE__).'/include/AirtimeIni.php');
+// Need to check that we are superuser before running this.
+AirtimeIni::ExitIfNotRoot();
require_once(dirname(__FILE__).'/../application/configs/conf.php');
-require_once(dirname(__FILE__).'/installInit.php');
+require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
-// Need to check that we are superuser before running this.
-AirtimeInstall::ExitIfNotRoot();
AirtimeInstall::RemoveSymlinks();
+echo "Uninstalling Airtime ".AIRTIME_VERSION.PHP_EOL;
+
echo "******************************* Uninstall Begin ********************************".PHP_EOL;
//------------------------------------------------------------------------
// Delete the database
@@ -80,7 +75,7 @@ if ($results == 0) {
// Delete files
//------------------------------------------------------------------------
AirtimeInstall::DeleteFilesRecursive($CC_CONFIG['storageDir']);
-
+AirtimeIni::RemoveIniFiles();
$command = "python ".__DIR__."/../python_apps/pypo/install/pypo-uninstall.py";
system($command);
diff --git a/install/airtime-upgrade.php b/install/airtime-upgrade.php
index 7d6fd3bdb..a84617321 100644
--- a/install/airtime-upgrade.php
+++ b/install/airtime-upgrade.php
@@ -6,27 +6,23 @@
* @license http://www.gnu.org/licenses/gpl.txt
*/
-// Do not allow remote execution
-$arr = array_diff_assoc($_SERVER, $_ENV);
-if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
- header("HTTP/1.1 400");
- header("Content-type: text/plain; charset=UTF-8");
- echo "400 Not executable\r\n";
- exit(1);
-}
+require_once(dirname(__FILE__).'/include/AirtimeIni.php');
+require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
-require_once(dirname(__FILE__).'/installInit.php');
-
-AirtimeInstall::ExitIfNotRoot();
+AirtimeIni::ExitIfNotRoot();
echo "******************************** Update Begin *********************************".PHP_EOL;
-AirtimeInstall::UpdateIniValue('../build/build.properties', 'project.home', realpath(__dir__.'/../'));
+AirtimeIni::CreateIniFile();
+AirtimeIni::UpdateIniFiles();
echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL;
AirtimeInstall::MigrateTables(__DIR__);
echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
-system("python ".__DIR__."/../pypo/install/pypo-install.py");
+system("python ".__DIR__."/../python_apps/pypo/install/pypo-install.py");
+
+echo PHP_EOL."*** Recorder Installation ***".PHP_EOL;
+system("python ".__DIR__."/../python_apps/show-recorder/install/recorder-install.py");
echo "******************************* Update Complete *******************************".PHP_EOL;
diff --git a/install/include/AirtimeIni.php b/install/include/AirtimeIni.php
new file mode 100644
index 000000000..33e7f772e
--- /dev/null
+++ b/install/include/AirtimeIni.php
@@ -0,0 +1,169 @@
+ strlen($p_property))
+ if ($p_property == substr($lines[$i], 0, strlen($p_property))){
+ $lines[$i] = "$p_property = $p_value\n";
+ }
+ }
+
+ $fp=fopen($p_filename, 'w');
+ for($i=0; $i<$n; $i++){
+ fwrite($fp, $lines[$i]);
+ }
+ fclose($fp);
+ }
+
+ /**
+ * After the configuration files have been copied to /etc/airtime,
+ * this function will update them to values unique to this
+ * particular installation.
+ */
+ static function UpdateIniFiles()
+ {
+ $api_key = AirtimeIni::GenerateRandomString();
+ AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'api_key', $api_key);
+ AirtimeIni::UpdateIniValue('/etc/airtime/airtime.conf', 'baseFilesDir', realpath(__DIR__.'/../../').'/files');
+ AirtimeIni::UpdateIniValue('/etc/airtime/pypo.cfg', 'api_key', "'$api_key'");
+ AirtimeIni::UpdateIniValue('/etc/airtime/recorder.cfg', 'api_key', "'$api_key'");
+ AirtimeIni::UpdateIniValue(__DIR__.'/../../build/build.properties', 'project.home', realpath(__dir__.'/../../'));
+ }
+}
diff --git a/install/installInit.php b/install/include/AirtimeInstall.php
similarity index 68%
rename from install/installInit.php
rename to install/include/AirtimeInstall.php
index 1efaa4833..6f9ce0ef5 100644
--- a/install/installInit.php
+++ b/install/include/AirtimeInstall.php
@@ -1,11 +1,7 @@
strlen($property))
- if ($property == substr($lines[$i], 0, strlen($property))){
- $lines[$i] = "$property = $value\n";
- }
- }
-
- $fp=fopen($filename, 'w');
- for($i=0; $i<$n; $i++){
- fwrite($fp, $lines[$i]);
- }
- fclose($fp);
- }
-
public static function SetupStorageDirectory($CC_CONFIG)
{
global $CC_CONFIG, $CC_DBC;
@@ -145,9 +95,15 @@ class AirtimeInstall {
@exec($command, $output, $results);
if ($results == 0) {
- echo "* User {$CC_CONFIG['dsn']['username']} created.".PHP_EOL;
+ echo "* Database user '{$CC_CONFIG['dsn']['username']}' created.".PHP_EOL;
} else {
- echo "* Could not create user {$CC_CONFIG['dsn']['username']}: $output".PHP_EOL;
+ if (count($output) > 0) {
+ echo "* Could not create user '{$CC_CONFIG['dsn']['username']}': ".PHP_EOL;
+ echo implode(PHP_EOL, $output);
+ }
+ else {
+ echo "* Database user '{$CC_CONFIG['dsn']['username']}' already exists.".PHP_EOL;
+ }
}
}
@@ -160,7 +116,13 @@ class AirtimeInstall {
if ($results == 0) {
echo "* Database '{$CC_CONFIG['dsn']['database']}' created.".PHP_EOL;
} else {
- echo "* Could not create database '{$CC_CONFIG['dsn']['database']}': $output".PHP_EOL;
+ if (count($output) > 0) {
+ echo "* Could not create database '{$CC_CONFIG['dsn']['database']}': ".PHP_EOL;
+ echo implode(PHP_EOL, $output);
+ }
+ else {
+ echo "* Database '{$CC_CONFIG['dsn']['database']}' already exists.".PHP_EOL;
+ }
}
}
@@ -181,7 +143,7 @@ class AirtimeInstall {
public static function CreateDatabaseTables()
{
// Put Propel sql files in Database
- $command = __DIR__."/../library/propel/generator/bin/propel-gen ../build/ insert-sql 2>propel-error.log";
+ $command = __DIR__."/../../library/propel/generator/bin/propel-gen ../build/ insert-sql 2>propel-error.log";
@exec($command, $output, $results);
}
@@ -191,13 +153,6 @@ class AirtimeInstall {
system($command);
}
- public static function SetUpPythonEggs()
- {
- //install poster streaming upload
- $command = "sudo easy_install poster";
- @exec($command);
- }
-
public static function DeleteFilesRecursive($p_path)
{
$command = "rm -rf $p_path";
@@ -207,10 +162,10 @@ class AirtimeInstall {
public static function CreateSymlinks(){
AirtimeInstall::RemoveSymlinks();
- $dir = realpath(__DIR__."/../utils/airtime-import");
+ $dir = realpath(__DIR__."/../../utils/airtime-import");
exec("ln -s $dir /usr/bin/airtime-import");
- $dir = realpath(__DIR__."/../utils/airtime-clean-storage");
+ $dir = realpath(__DIR__."/../../utils/airtime-clean-storage");
exec("ln -s $dir /usr/bin/airtime-clean-storage");
}
@@ -218,6 +173,4 @@ class AirtimeInstall {
exec("rm -f /usr/bin/airtime-import");
exec("rm -f /usr/bin/airtime-clean-storage");
}
-
-
}
diff --git a/plugins/jquery.showinfo.js b/plugins/jquery.showinfo.js
index c31381a10..c6eba4959 100644
--- a/plugins/jquery.showinfo.js
+++ b/plugins/jquery.showinfo.js
@@ -4,8 +4,10 @@
var defaults = {
updatePeriod: 20, //seconds
sourceDomain: "http://localhost/", //where to get show status from
+ text: {onAirToday:"On air today"}
};
var options = $.extend(defaults, options);
+ options.sourceDomain = addEndingBackslash(options.sourceDomain);
return this.each(function() {
var obj = $(this);
@@ -29,7 +31,7 @@
}
tableString = "";
- tableString += "
On air today
";
+ tableString += "
"+options.text.onAirToday+"
";
tableString += "
';
+
+ $("#"+dow[i]).empty();
+ $("#"+dow[i]).append(html);
+ }
+ }
+
+ function processData(data){
+ updateWidget(data);
+ }
+
+ function airtimeScheduleJsonpError(jqXHR, textStatus, errorThrown){
+ }
+
+ function getServerData(){
+ $.ajax({ url: options.sourceDomain + "api/week-info/", dataType:"jsonp", success:function(data){
+ processData(data);
+ }, error:airtimeScheduleJsonpError});
+ setTimeout(getServerData, options.updatePeriod*1000);
+ }
+ });
+ };
+})(jQuery);
+
+function addEndingBackslash(str){
+ if (str.charAt(str.length-1) != '/')
+ return str+'/';
+ else return str;
+}
+
/* ScheduleData class BEGIN */
function ScheduleData(data){
this.data = data;
@@ -263,5 +375,5 @@ function convertDateToPosixTime(s){
} else
sec = time[2];
- return Date.UTC(year, month, day, hour, minute, sec, msec);
+ return Date.UTC(year, month-1, day, hour, minute, sec, msec);
}
diff --git a/public/css/images/icon_finishedplaying_m.png b/public/css/images/icon_finishedplaying_m.png
new file mode 100644
index 000000000..5b221d29d
Binary files /dev/null and b/public/css/images/icon_finishedplaying_m.png differ
diff --git a/public/css/images/icon_nowplaying_m.png b/public/css/images/icon_nowplaying_m.png
new file mode 100644
index 000000000..844f80193
Binary files /dev/null and b/public/css/images/icon_nowplaying_m.png differ
diff --git a/public/css/images/icon_soundcloud.png b/public/css/images/icon_soundcloud.png
new file mode 100644
index 000000000..03c943309
Binary files /dev/null and b/public/css/images/icon_soundcloud.png differ
diff --git a/public/css/images/icon_soundcloud_m.png b/public/css/images/icon_soundcloud_m.png
new file mode 100644
index 000000000..553f4df98
Binary files /dev/null and b/public/css/images/icon_soundcloud_m.png differ
diff --git a/public/css/redmond/jquery-ui-1.8.8.custom.css b/public/css/redmond/jquery-ui-1.8.8.custom.css
index 1179f337c..aaef2c929 100644
--- a/public/css/redmond/jquery-ui-1.8.8.custom.css
+++ b/public/css/redmond/jquery-ui-1.8.8.custom.css
@@ -1513,4 +1513,4 @@ padding: 0;
.ui-datepicker {
display:none;
-}
\ No newline at end of file
+}
diff --git a/public/css/styles.css b/public/css/styles.css
index 7d0dc8690..3f11e491e 100644
--- a/public/css/styles.css
+++ b/public/css/styles.css
@@ -1211,6 +1211,10 @@ ul.errors {
margin:0;
}
+.formrow-repeat ul.errors {
+ width:278px;
+}
+
ul.errors li {
color:#902d2d;
font-size:11px;
@@ -1440,7 +1444,7 @@ div.success{
list-style-type:none;
margin:0 0 7px 0;
padding:0;
- height:26px;
+ /*height:26px;*/
display:block;
}
.formrow-repeat li .ui-button-icon-only {
@@ -1501,7 +1505,10 @@ div.success{
.small-icon.rebroadcast {
background:url(images/icon_rebroadcast.png) no-repeat 0 0;
}
-
+.small-icon.soundcloud {
+ background:url(images/icon_soundcloud.png) no-repeat 0 0;
+ width:21px;
+}
.medium-icon {
display:block;
width:25px;
@@ -1511,8 +1518,23 @@ div.success{
}
.medium-icon.recording {
background:url(images/icon_record_m.png) no-repeat 0 0;
+ width:20px;
}
.medium-icon.rebroadcast {
background:url(images/icon_rebroadcast_m.png) no-repeat 0 0;
}
-
+.medium-icon.soundcloud {
+ background:url(images/icon_soundcloud_m.png) no-repeat 0 0;
+ width:21px;
+}
+.medium-icon.nowplaying, .medium-icon.finishedplaying {
+ background:url(images/icon_nowplaying_m.png) no-repeat 0 0;
+ width:12px;
+ height:9px;
+ float:left;
+ margin-left:6px;
+ margin-right:0;
+}
+.medium-icon.finishedplaying {
+ background:url(images/icon_finishedplaying_m.png) no-repeat 0 0;
+}
diff --git a/public/js/airtime/schedule/add-show.js b/public/js/airtime/schedule/add-show.js
index 329391086..480530e7e 100644
--- a/public/js/airtime/schedule/add-show.js
+++ b/public/js/airtime/schedule/add-show.js
@@ -181,8 +181,15 @@ function setAddShowEvents() {
makeAddShowButton();
});
- form.find("#add-show-submit")
+ form.find(".add-show-submit")
.click(function(event){
+ var addShowButton = $(this);
+ if (!addShowButton.hasClass("disabled")){
+ addShowButton.addClass("disabled");
+ } else {
+ return;
+ }
+
event.preventDefault();
var data = $("form").serializeArray();
@@ -203,6 +210,7 @@ function setAddShowEvents() {
var end_date = $("#add_show_end_date").val();
$.post("/Schedule/add-show", {format: "json", data: data, hosts: hosts, days: days}, function(json){
+ addShowButton.removeClass("disabled");
if(json.form) {
$("#add-show-form")
.empty()
diff --git a/public/js/playlist/helperfunctions.js b/public/js/playlist/helperfunctions.js
index a9a57467c..cdd2eb931 100644
--- a/public/js/playlist/helperfunctions.js
+++ b/public/js/playlist/helperfunctions.js
@@ -134,7 +134,7 @@ function convertDateToPosixTime(s){
} else
sec = time[2];
- return Date.UTC(year, month, day, hour, minute, sec, msec);
+ return Date.UTC(year, month-1, day, hour, minute, sec, msec);
}
function getFileExt(filename){
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index cd2a6e7d7..9ff02ee74 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -117,7 +117,7 @@ class AirTimeApiClient(ApiClientInterface):
def __get_airtime_version(self, verbose = True):
logger = logging.getLogger()
- url = self.config["base_url"] + self.config["api_base"] + self.config["version_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["version_url"])
logger.debug("Trying to contact %s", url)
url = url.replace("%%api_key%%", self.config["api_key"])
@@ -198,7 +198,8 @@ class AirTimeApiClient(ApiClientInterface):
logger = logging.getLogger()
# Construct the URL
- export_url = self.config["base_url"] + self.config["api_base"] + self.config["export_url"]
+ #export_url = self.config["base_url"] + self.config["api_base"] + self.config["export_url"]
+ export_url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["export_url"])
logger.info("Fetching schedule from %s", export_url)
export_url = export_url.replace('%%api_key%%', self.config["api_key"])
@@ -215,12 +216,15 @@ class AirTimeApiClient(ApiClientInterface):
return status, response
- def get_media(self, src, dst):
+ def get_media(self, uri, dst):
logger = logging.getLogger()
try:
+ src = "http://%s:%s/%s/%s" % \
+ (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["get_media_url"])
+ src = src.replace("%%file%%", uri)
logger.info("try to download from %s to %s", src, dst)
- src = src + "/api_key/" + self.config["api_key"]
+ src = src.replace("%%api_key%%", self.config["api_key"])
# check if file exists already before downloading again
filename, headers = urllib.urlretrieve(src, dst)
except Exception, e:
@@ -234,7 +238,9 @@ class AirTimeApiClient(ApiClientInterface):
logger = logging.getLogger()
playlist = schedule[pkey]
schedule_id = playlist["schedule_id"]
- url = self.config["base_url"] + self.config["api_base"] + self.config["update_item_url"]
+ #url = self.config["base_url"] + self.config["api_base"] + self.config["update_item_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_item_url"])
+
url = url.replace("%%schedule_id%%", str(schedule_id))
logger.debug(url)
url = url.replace("%%api_key%%", self.config["api_key"])
@@ -261,7 +267,8 @@ class AirTimeApiClient(ApiClientInterface):
response = ''
try:
schedule_id = data
- url = self.config["base_url"] + self.config["api_base"] + self.config["update_start_playing_url"]
+ #url = self.config["base_url"] + self.config["api_base"] + self.config["update_start_playing_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_start_playing_url"])
url = url.replace("%%media_id%%", str(media_id))
url = url.replace("%%schedule_id%%", str(schedule_id))
logger.debug(url)
@@ -288,9 +295,10 @@ class AirTimeApiClient(ApiClientInterface):
def get_shows_to_record(self):
logger = logging.getLogger()
- response = ''
+ response = None
try:
- url = self.config["base_url"] + self.config["api_base"] + self.config["show_schedule_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["show_schedule_url"])
+ #url = self.config["base_url"] + self.config["api_base"] + self.config["show_schedule_url"]
logger.debug(url)
url = url.replace("%%api_key%%", self.config["api_key"])
@@ -301,23 +309,40 @@ class AirTimeApiClient(ApiClientInterface):
except Exception, e:
logger.error("Exception: %s", e)
- return response[u'shows']
+ return response
def upload_recorded_show(self, data, headers):
logger = logging.getLogger()
response = ''
- try:
- url = self.config["base_url"] + self.config["api_base"] + self.config["upload_file_url"]
- logger.debug(url)
- url = url.replace("%%api_key%%", self.config["api_key"])
- request = urllib2.Request(url, data, headers)
- response = urllib2.urlopen(request).read().strip()
+ retries = int(self.config["upload_retries"])
+ retries_wait = int(self.config["upload_wait"])
- logger.info("uploaded show result %s", response)
-
- except Exception, e:
- logger.error("Exception: %s", e)
+ #url = self.config["base_url"] + self.config["api_base"] + self.config["upload_file_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["upload_file_url"])
+
+ logger.debug(url)
+ url = url.replace("%%api_key%%", self.config["api_key"])
+
+ for i in range(0, retries):
+ logger.debug("Upload attempt: %s", i+1)
+
+ try:
+ request = urllib2.Request(url, data, headers)
+ response = urllib2.urlopen(request).read().strip()
+
+ logger.info("uploaded show result %s", response)
+ break
+
+ except urllib2.HTTPError, e:
+ logger.error("Http error code: %s", e.code)
+ except urllib2.URLError, e:
+ logger.error("Server is down: %s", e.args)
+ except Exception, e:
+ logger.error("Exception: %s", e)
+
+ #wait some time before next retry
+ time.sleep(retries_wait)
return response
@@ -368,7 +393,9 @@ class ObpApiClient():
logger = logging.getLogger()
# lookup OBP version
- url = self.config["base_url"] + self.config["api_base"]+ self.config["version_url"]
+ #url = self.config["base_url"] + self.config["api_base"]+ self.config["version_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["version_url"])
+
try:
logger.debug("Trying to contact %s", url)
@@ -427,7 +454,8 @@ class ObpApiClient():
range['end'] = end
# Construct the URL
- export_url = self.config["base_url"] + self.config["api_base"] + self.config["export_url"]
+ #export_url = self.config["base_url"] + self.config["api_base"] + self.config["export_url"]
+ export_url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["export_url"])
# Insert the start and end times into the URL
export_url = export_url.replace('%%api_key%%', self.config["api_key"])
@@ -465,7 +493,8 @@ class ObpApiClient():
def notify_scheduled_item_start_playing(self, pkey, schedule):
#def update_scheduled_item(self, item_id, value):
logger = logging.getLogger()
- url = self.config["base_url"] + self.config["api_base"] + self.config["update_item_url"]
+ #url = self.config["base_url"] + self.config["api_base"] + self.config["update_item_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_item_url"])
url = url.replace("%%item_id%%", str(schedule[pkey]["id"]))
url = url.replace("%%played%%", "1")
@@ -495,7 +524,8 @@ class ObpApiClient():
playlist_id = data["playlist_id"]
transmission_id = data["transmission_id"]
- url = self.config["base_url"] + self.config["api_base"] + self.config["update_start_playing_url"]
+ #url = self.config["base_url"] + self.config["api_base"] + self.config["update_start_playing_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_start_playing_url"])
url = url.replace("%%playlist_type%%", str(playlist_type))
url = url.replace("%%export_source%%", str(export_source))
url = url.replace("%%media_id%%", str(media_id))
@@ -521,7 +551,8 @@ class ObpApiClient():
def generate_range_dp(self):
logger = logging.getLogger()
- url = self.config["base_url"] + self.config["api_base"] + self.config["generate_range_url"]
+ #url = self.config["base_url"] + self.config["api_base"] + self.config["generate_range_url"]
+ url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["generate_range_url"])
try:
response = urllib.urlopen(url, self.api_auth)
diff --git a/python_apps/pypo/pypo-api-validator.py b/python_apps/pypo/pypo-api-validator.py
index f5c85e317..0fcce4fef 100755
--- a/python_apps/pypo/pypo-api-validator.py
+++ b/python_apps/pypo/pypo-api-validator.py
@@ -31,7 +31,7 @@ import unittest
logging.config.fileConfig("logging-api-validator.cfg")
try:
- config = ConfigObj('config.cfg')
+ config = ConfigObj('/etc/airtime/pypo.cfg')
except Exception, e:
print 'Error loading config file: ', e
sys.exit()
diff --git a/python_apps/pypo/pypo-cli.py b/python_apps/pypo/pypo-cli.py
index 208049d7b..87b24b8b4 100755
--- a/python_apps/pypo/pypo-cli.py
+++ b/python_apps/pypo/pypo-cli.py
@@ -63,7 +63,7 @@ logging.config.fileConfig("logging.cfg")
# loading config file
try:
- config = ConfigObj('config.cfg')
+ config = ConfigObj('/etc/airtime/pypo.cfg')
except Exception, e:
print 'Error loading config file: ', e
sys.exit()
diff --git a/python_apps/pypo/pypo-notify.py b/python_apps/pypo/pypo-notify.py
index 5e46e088f..d59932dcb 100755
--- a/python_apps/pypo/pypo-notify.py
+++ b/python_apps/pypo/pypo-notify.py
@@ -58,7 +58,7 @@ logging.config.fileConfig("logging.cfg")
# loading config file
try:
- config = ConfigObj('config.cfg')
+ config = ConfigObj('/etc/airtime/pypo.cfg')
except Exception, e:
print 'error: ', e
diff --git a/python_apps/pypo/config.cfg b/python_apps/pypo/pypo.cfg
similarity index 95%
rename from python_apps/pypo/config.cfg
rename to python_apps/pypo/pypo.cfg
index 2c0fce6f0..b1f9ed229 100644
--- a/python_apps/pypo/config.cfg
+++ b/python_apps/pypo/pypo.cfg
@@ -18,7 +18,8 @@ file_dir = '/opt/pypo/files/'
tmp_dir = '/opt/pypo/tmp/'
# Hostname
-base_url = 'http://localhost/'
+base_url = 'localhost'
+base_port = 80
############################################
# Liquidsoap settings #
@@ -77,7 +78,7 @@ cue_style = 'pre'
api_key = 'AAA'
# Path to the base of the API
-api_base = 'api/'
+api_base = 'api'
# URL to get the version number of the server API
version_url = 'version/api_key/%%api_key%%'
@@ -85,7 +86,9 @@ version_url = 'version/api_key/%%api_key%%'
# Schedule export path.
# %%from%% - starting date/time in the form YYYY-MM-DD-hh-mm
# %%to%% - starting date/time in the form YYYY-MM-DD-hh-mm
-export_url = 'schedule/api_key/%%api_key%%'
+export_url = 'schedule/api_key/%%api_key%%'
+
+get_media_url = 'get-media/file/%%file%%/api_key/%%api_key%%'
# Update whether a schedule group has begun playing.
update_item_url = 'notify-schedule-group-play/api_key/%%api_key%%/schedule_id/%%schedule_id%%'
diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py
index 2958c6bd4..aada900ff 100644
--- a/python_apps/pypo/pypofetch.py
+++ b/python_apps/pypo/pypofetch.py
@@ -27,7 +27,7 @@ logging.config.fileConfig("logging.cfg")
# loading config file
try:
- config = ConfigObj('config.cfg')
+ config = ConfigObj('/etc/airtime/pypo.cfg')
LS_HOST = config['ls_host']
LS_PORT = config['ls_port']
POLL_INTERVAL = int(config['poll_interval'])
@@ -84,9 +84,12 @@ class PypoFetch(Thread):
pypo_timezone = (process.communicate()[0]).strip(' \r\n\t')
if server_timezone != pypo_timezone:
- logger.error("Server and pypo timezone offsets do not match. Audio playback may not start when expected!")
- logger.error("Server timezone offset: %s", server_timezone)
- logger.error("Pypo timezone offset: %s", pypo_timezone)
+ logger.error("ERROR: Airtime server and pypo timezone offsets do not match. Audio playback will not start when expected!!!")
+ logger.error(" * Server timezone offset: %s", server_timezone)
+ logger.error(" * Pypo timezone offset: %s", pypo_timezone)
+ logger.error(" * To fix this, you need to set the 'date.timezone' value in your php.ini file and restart apache.")
+ logger.error(" * See this page for more info (v1.7): http://wiki.sourcefabric.org/x/BQBF")
+ logger.error(" * and also the 'FAQ and Support' page underneath it.")
"""
Process the schedule
@@ -208,12 +211,8 @@ class PypoFetch(Thread):
(self.cache_dir, str(pkey), str(media['id']), str(float(media['cue_in']) / 1000), str(float(media['cue_out']) / 1000), str(fileExt))
do_cue = True
- # check if it is a remote file, if yes download
- if media['uri'][0:4] == 'http':
- self.handle_remote_file(media, dst, do_cue)
- else:
- logger.debug("invalid media uri: %s", media['uri'])
-
+ # download media file
+ self.handle_remote_file(media, dst, do_cue)
if True == os.access(dst, os.R_OK):
# check filesize (avoid zero-byte files)
diff --git a/python_apps/pypo/pypopush.py b/python_apps/pypo/pypopush.py
index 25bfddbf1..db3d95393 100644
--- a/python_apps/pypo/pypopush.py
+++ b/python_apps/pypo/pypopush.py
@@ -20,7 +20,7 @@ logging.config.fileConfig("logging.cfg")
# loading config file
try:
- config = ConfigObj('config.cfg')
+ config = ConfigObj('/etc/airtime/pypo.cfg')
LS_HOST = config['ls_host']
LS_PORT = config['ls_port']
PUSH_INTERVAL = 2
diff --git a/python_apps/pypo/scripts/ls_config.liq b/python_apps/pypo/scripts/liquidsoap.cfg
similarity index 60%
rename from python_apps/pypo/scripts/ls_config.liq
rename to python_apps/pypo/scripts/liquidsoap.cfg
index 20b1f4215..a7f310f1a 100644
--- a/python_apps/pypo/scripts/ls_config.liq
+++ b/python_apps/pypo/scripts/liquidsoap.cfg
@@ -1,9 +1,6 @@
###########################################
# liquidsoap config file #
###########################################
-# This config assumes that there are
-# two instances of LS running
-# the "scheduler" & the "fallback" instance
###########################################
@@ -13,13 +10,6 @@
log_file = "/var/log/pypo/