Merge branch '2.0.x' of dev.sourcefabric.org:airtime into 2.0.x

CREDITS

@@ -1,3 +1,10 @@
+=======
+CREDITS
+=======
+Version 2.0.2
+-------------
+Same as previous version.
+
 =======
 CREDITS
 =======

airtime_mvc/application/models/Nowplaying.php

@@ -76,9 +76,12 @@ class Application_Model_Nowplaying
             $startCutoff = 60;
             $endCutoff = 86400; //60*60*24 - seconds in a day
         } else {
+            $time = date("H:i:s");
+            $utcDate = Application_Model_DateHelper::ConvertToUtcDateTimeString($dateString." ".$time);
+            
             $date = new Application_Model_DateHelper;
-            $time = $date->getTime();
-            $date->setDate($dateString." ".$time);
+            $date->setDate($utcDate);
+            
             $timeNow = $date->getUtcTimestamp();
 
             $startCutoff = $date->getNowDayStartDiff();
@@ -88,6 +91,7 @@ class Application_Model_Nowplaying
         $data = array();
 
         $showIds = Application_Model_ShowInstance::GetShowsInstancesIdsInRange($timeNow, $startCutoff, $endCutoff);
+        
     
         //get all the pieces to be played between the start cut off and the end cut off.
         $scheduledItems = Application_Model_Schedule::getScheduleItemsInRange($timeNow, $startCutoff, $endCutoff);

changelog

@@ -1,3 +1,13 @@
+2.0.2 - February 28, 2012
+  * Bug Fixes:
+    * Fixed Airtime could stop automatically playing after 24 hours if the web interface isn't used (regression in 2.0.1).
+    * Fixed Airtime could stop automatically recording after 2 hours if the web interface isn't used.
+    * Fixed upgrading from 1.8.2 when the stor directory was a symlink would cause filenames to not be preserved.
+    * Fixed Day View in the Now Playing tab showed some items on incorrect days.
+    * Fixed problems with having an equal '=' sign as an icecast password 
+  * Other
+    * Various optimizations to make Airtime feel snappier in the browser. Various views should
+      load much quicker.
 2.0.1 - February 14, 2012
   * Changes:
     * Widgets should have a version string so users can make sure widgets are up to date

install_minimal/upgrades/airtime-1.9.0/airtime-upgrade.php

@@ -617,7 +617,18 @@ class Airtime190Upgrade{
 
         echo "Save DbMd to File".PHP_EOL;
 
-        $stor_dir = realpath($values['general']['base_files_dir']."/stor");
+
+        /* Do not use realpath. It expands a symlinked path into its real path
+         * which then causes us problems for string comparisons later on. */
+        //$stor_dir = realpath($values['general']['base_files_dir']."/stor");
+
+        $baseDir = $values['general']['base_files_dir'];
+        if ($baseDir[strlen($baseDir)-1] != '/'){
+            $baseDir.='/';
+        }
+        
+        $stor_dir = $baseDir.'stor';
+
 
         $files = CcFilesQuery::create()
            ->setFormatter(ModelCriteria::FORMAT_ON_DEMAND)

python_apps/pypo/pypofetch.py

@@ -54,7 +54,7 @@ class PypoFetch(Thread):
     def handle_message(self, message):
         try:        
             logger = logging.getLogger('fetch')
-            logger.info("Received event from RabbitMQ: %s" % message)
+            logger.info("Received event from Pypo Message Handler: %s" % message)
             
             m =  json.loads(message)
             command = m['event_type']
@@ -80,7 +80,7 @@ class PypoFetch(Thread):
             top = traceback.format_exc()
             logger.error('Exception: %s', e)
             logger.error("traceback: %s", top)
-            logger.error("Exception in handling RabbitMQ message: %s", e)
+            logger.error("Exception in handling Message Handler message: %s", e)
         
     def stop_current_show(self):
         logger = logging.getLogger('fetch')

python_apps/pypo/recorder.py

@@ -169,7 +169,7 @@ class Recorder(Thread):
     def __init__(self, q):
         Thread.__init__(self)
         self.logger = logging.getLogger('recorder')
-        self.api_client = api_client.api_client_factory(config)
+        self.api_client = api_client.api_client_factory(config, self.logger)
         self.api_client.register_component("show-recorder")
         self.sr = None
         self.shows_to_record = {}
@@ -183,7 +183,7 @@ class Recorder(Thread):
             message = self.queue.get()
             msg =  json.loads(message)
             command = msg["event_type"]
-            self.logger.info("Received msg from Pypo Fetch: %s", msg)
+            self.logger.info("Received msg from Pypo Message Handler: %s", msg)
             if command == 'cancel_recording':
                 if self.sr is not None and self.sr.is_recording():
                     self.sr.cancel_recording()