Merge branch 'devel' of dev.sourcefabric.org:airtime into devel

dev_tools/gen_doctrine_migration.php

@@ -5,5 +5,5 @@
 	 */
 
     $dir = __DIR__;
-    $command = "php $dir/../library/doctrine/migrations/doctrine-migrations.phar --configuration=$dir/../install/DoctrineMigrations/migrations.xml --db-configuration=$dir/../library/doctrine/migrations/migrations-db.php --no-interaction migrations:generate";
+    $command = "php $dir/../airtime_mvc/library/doctrine/migrations/doctrine-migrations.phar --configuration=$dir/../install/DoctrineMigrations/migrations.xml --db-configuration=$dir/../airtime_mvc/library/doctrine/migrations/migrations-db.php --no-interaction migrations:generate";
     system($command);

install/DoctrineMigrations/Version20110629143017.php

@@ -0,0 +1,37 @@
+<?php
+
+//CC-2279 Upgrade script for converting stor directory to new format
+
+namespace DoctrineMigrations;
+
+use Doctrine\DBAL\Migrations\AbstractMigration,
+    Doctrine\DBAL\Schema\Schema;
+
+class Version20110629143017 extends AbstractMigration
+{
+    public function up(Schema $schema)
+    {
+        //create cc_music_dirs table
+        $cc_music_dirs = $schema->createTable('cc_music_dirs');
+
+        $cc_music_dirs->addColumn('id', 'integer', array('unsigned' => true, 'autoincrement' => true));
+        $cc_music_dirs->addColumn('type', 'string', array('length' => 255));
+        $cc_music_dirs->addColumn('directory', 'text',  array('unique' => true));
+
+        $cc_music_dirs->setPrimaryKey(array('id'));
+        //end create cc_music_dirs table
+
+
+        //start cc_files modifications
+        $cc_files = $schema->getTable('cc_files');
+        $cc_files->addColumn('directory', 'integer');
+
+        $cc_files->addNamedForeignKeyConstraint('cc_music_dirs_folder_fkey', $cc_music_dirs, array('directory'), array('id'), array('onDelete' => 'CASCADE'));
+        //end cc_files modifications
+    }
+
+    public function down(Schema $schema)
+    {
+
+    }
+}

install/upgrades/airtime-1.9/airtime-upgrade.php

@@ -16,12 +16,34 @@ AirtimeInstall::CreateZendPhpLogFile();
 const CONF_DIR_BINARIES = "/usr/lib/airtime";
 const CONF_FILE_AIRTIME = "/etc/airtime/airtime.conf";
 
+function BypassMigrations($version)
+{
+    $appDir = __DIR__."/../../airtime_mvc";
+    $dir = __DIR__;
+    $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
+                "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
+                "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
+                "--no-interaction --add migrations:version $version";
+    system($command);
+}
+
+function MigrateTablesToVersion($version)
+{
+    $appDir = __DIR__."/../../airtime_mvc";
+    $dir = __DIR__;
+    $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ".
+                "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
+                "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
+                "--no-interaction migrations:migrate $version";
+    system($command);
+}
+
 function InstallPhpCode($phpDir)
 {
     global $CC_CONFIG;
-    
+
     $AIRTIME_SRC = realpath(__DIR__.'/../../../airtime_mvc');
-    
+
     echo "* Installing PHP code to ".$phpDir.PHP_EOL;
     exec("mkdir -p ".$phpDir);
     exec("cp -R ".$AIRTIME_SRC."/* ".$phpDir);
@@ -30,7 +52,7 @@ function InstallPhpCode($phpDir)
 function InstallBinaries()
 {
     $utilsSrc = __DIR__."/../../../utils";
-    
+
     echo "* Installing binaries to ".CONF_DIR_BINARIES.PHP_EOL;
     exec("mkdir -p ".CONF_DIR_BINARIES);
     exec("cp -R ".$utilsSrc." ".CONF_DIR_BINARIES);

python_apps/media-monitor/MediaMonitor.py

@@ -18,10 +18,6 @@ def handleSigTERM(signum, frame):
         p.terminate()
         logger.info("Killed process. %d", p.pid)
 
-    notifier_daemon_pid = open('/var/run/airtime-notifier.pid', 'r').read()
-    os.kill(int(notifier_daemon_pid), 9)
-    logger.info("Killed process. %d", int(notifier_daemon_pid))
-
     sys.exit(0)
 
 
@@ -65,8 +61,8 @@ try:
     logger.info("Added watch to %s", storage_directory)
     logger.info("wdd result %s", wdd[storage_directory])
 
-    notifier.loop(daemonize=True, callback=pe.notifier_loop_callback, pid_file='/var/run/airtime-notifier.pid', stdout='/var/log/airtime/media-monitor/media-monitor.log')
+    notifier.loop(callback=pe.notifier_loop_callback)
-    
+
     for p in processes:
         p.join()
 

python_apps/media-monitor/install/media-monitor-uninstall.py

@@ -29,7 +29,6 @@ try:
 
     os.system("/etc/init.d/airtime-media-monitor stop")
     os.system("rm -f /etc/init.d/airtime-media-monitor")
-    os.system("rm -f /var/run/airtime-notifier.pid")
     os.system("update-rc.d -f airtime-media-monitor remove >/dev/null 2>&1")
 
     print "Removing log directories"

widgets/sample_page.html

@@ -12,22 +12,23 @@
 <script>    
 $(document).ready(function() {
     $("#headerLiveHolder").airtimeLiveInfo({
-        sourceDomain: "http://airtime-dev.sourcefabric.org",
+        sourceDomain: "http://localhost",
         text: {onAirNow:"On air today"},
         updatePeriod: 20 //seconds
     });
     $("#onAirToday").airtimeShowSchedule({
-        sourceDomain: "http://airtime-dev.sourcefabric.org",
+        sourceDomain: "http://localhost",
         text: {onAirNow:"On Air Now", offline:"Offline", current:"Current", next:"Next"},
         updatePeriod: 5 //seconds
     });
     $("#scheduleTabs").airtimeWeekSchedule({
-        sourceDomain:"http://airtime-dev.sourcefabric.org/",
+        sourceDomain:"http://localhost",
         dowText:{monday:"Monday", tuesday:"Tuesday", wednesday:"Wednesday", thursday:"Thursday", friday:"Friday", saturday:"Saturday", sunday:"Sunday"},
         miscText:{time:"Time", programName:"Program Name", details:"Details", readMore:"Read More"},
         updatePeriod: 600 //seconds
     });
-    $('#scheduleTabs').tabs();
+    var d = new Date().getDay(); 
+    $('#scheduleTabs').tabs({selected: d === 0 ? 6 : d-1, fx: { opacity: 'toggle' }});
 
 });
 </script>