From 579180301ab1bfe848b9eb1d32ebcb7ab909d084 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Wed, 5 Sep 2012 15:05:50 -0400
Subject: [PATCH 1/3] Removed stat caching to make sure is_file is accurate

---
 airtime_mvc/application/controllers/ApiController.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 4dce47a29..ed80872ad 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -120,6 +120,8 @@ class ApiController extends Zend_Controller_Action
         if ($media != null) {
 
             $filepath = $media->getFilePath();
+            // Make sure we don't have some wrong result beecause of caching
+            clearstatcache();
             if (is_file($filepath)) {
                 $full_path = $media->getPropelOrm()->getDbFilepath();
 

From 0538023e3913afa4a89f4d17160c732b5b088884 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Wed, 5 Sep 2012 15:27:23 -0400
Subject: [PATCH 2/3] MM2: Removed python 2.7 style dictionary comprehnsions
 for backward compatibility

---
 python_apps/media-monitor2/media/monitor/pure.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/python_apps/media-monitor2/media/monitor/pure.py b/python_apps/media-monitor2/media/monitor/pure.py
index 5329df165..77a725941 100644
--- a/python_apps/media-monitor2/media/monitor/pure.py
+++ b/python_apps/media-monitor2/media/monitor/pure.py
@@ -496,7 +496,7 @@ def toposort(data):
     for k, v in data.items():
         v.discard(k) # Ignore self dependencies
     extra_items_in_deps = reduce(set.union, data.values()) - set(data.keys())
-    data.update({item:set() for item in extra_items_in_deps})
+    data.update(dict((item,set()) for item in extra_items_in_deps))
     while True:
         ordered = set(item for item,dep in data.items() if not dep)
         if not ordered: break

From f86fa8f9451014d66a0660a68e954dece11602d8 Mon Sep 17 00:00:00 2001
From: Rudi Grinberg <rudi.grinberg@sourcefabric.org>
Date: Wed, 5 Sep 2012 15:38:43 -0400
Subject: [PATCH 3/3] gotten rid of annoying logging

---
 airtime_mvc/application/controllers/ApiController.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index ed80872ad..2435b4e87 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -470,8 +470,8 @@ class ApiController extends Zend_Controller_Action
         // Replace this compound result in a hash with proper error handling later on
         $return_hash = array();
         Application_Model_Preference::SetImportTimestamp();
-        Logging::info("--->Mode: $mode || file: {$md['MDATA_KEY_FILEPATH']} ");
-        Logging::info( $md );
+        //Logging::info("--->Mode: $mode || file: {$md['MDATA_KEY_FILEPATH']} ");
+        //Logging::info( $md );
         if ($mode == "create") {
             $filepath = $md['MDATA_KEY_FILEPATH'];
             $filepath = Application_Common_OsPath::normpath($filepath);