CC-5709: Airtime Analyzer

* Remove the "hidden" field from the REST blacklist, the analyzer needs to set it.
* Added import_status column messages in the recent uploads table
* Auto-refresh the recent uploads table while imports are pending
* Moved the file moving stuff to its own analyzer in airtime_analyzer
* Basic error reporting to the REST API in airtime_analyzer, needs
  hardeneing though
* Fixed a bug with the number of recent uploads
* Prevent airtime_analyzer from running if media_monitor is running

airtime_mvc/application/controllers/PluploadController.php

@@ -48,20 +48,20 @@ class PluploadController extends Zend_Controller_Action
         $rowStart = isset($_GET['iDisplayStart']) ? $_GET['iDisplayStart'] : 0;
         
         $recentUploadsQuery = CcFilesQuery::create()->filterByDbUtime(array('min' => time() - 30 * 24 * 60 * 60))
-                            ->orderByDbUtime(Criteria::DESC)
-                            ->offset($rowStart)
-                            ->limit($limit);
+                            ->orderByDbUtime(Criteria::DESC);
+        
+        $numTotalRecentUploads = $recentUploadsQuery->find()->count();
         
         if ($filter == "pending") {
             $recentUploadsQuery->filterByDbImportStatus("1");
         } else if ($filter == "failed") {
             $recentUploadsQuery->filterByDbImportStatus(array('min' => 100));
         }
-        $recentUploads = $recentUploadsQuery->find();
+        
+        $recentUploads = $recentUploadsQuery->offset($rowStart)->limit($limit)->find();
         
         $numRecentUploads = $limit;
-        $numTotalRecentUploads = CcFilesQuery::create()->filterByDbUtime(array('min' => time() - 30 * 24 * 60 * 60))
-            ->count();
+        //CcFilesQuery::create()->filterByDbUtime(array('min' => time() - 30 * 24 * 60 * 60))
         
         //$this->_helper->json->sendJson(array("jsonrpc" => "2.0", "tempfilepath" => $tempFileName));
         

airtime_mvc/application/modules/rest/controllers/MediaController.php

@@ -7,7 +7,6 @@ class Rest_MediaController extends Zend_Rest_Controller
     private $blackList = array(
         'id',
         'file_exists',
-        'hidden',
         'silan_check',
         'soundcloud_id',
         'is_scheduled',
@@ -17,7 +16,6 @@ class Rest_MediaController extends Zend_Rest_Controller
     //fields we should never expose through our RESTful API
     private $privateFields = array(
         'file_exists',
-        'hidden',
         'silan_check',
         'is_scheduled',
         'is_playlist'

airtime_mvc/public/js/airtime/library/plupload.js

@@ -3,6 +3,16 @@ $(document).ready(function() {
     var uploader;
 	var self = this;
 	self.uploadFilter = "all";
+	
+	self.IMPORT_STATUS_CODES = {
+		0 : { message: $.i18n._("Successfully imported")},
+		1 : { message: $.i18n._("Pending import")},
+		2 : { message: $.i18n._("Import failed.")},
+		UNKNOWN : { message: $.i18n._("Unknown")}
+	};
+	if (Object.freeze) {
+		Object.freeze(self.IMPORT_STATUS_CODES);
+	}
 
 	$("#plupload_files").pluploadQueue({
 		// General settings
@@ -47,17 +57,13 @@ $(document).ready(function() {
 			console.log("Invalid data type for the import_status.");
 			return;
 		}
-		var statusStr = $.i18n._("Unknown");
-		if (data == 0)
-		{
-			statusStr = $.i18n._("Successfully imported");
-		} 
-		else if (data == 1)
-		{
-			statusStr = $.i18n._("Pending import");
-		}
+		var statusStr = self.IMPORT_STATUS_CODES.UNKNOWN.message;
+		var importStatusCode = data;
+		if (self.IMPORT_STATUS_CODES[importStatusCode]) {
+			statusStr = self.IMPORT_STATUS_CODES[importStatusCode].message;
+		};
 	
-         return statusStr;
+        return statusStr;
     };
     
 	self.renderFileActions = function ( data, type, full ) {
@@ -114,6 +120,23 @@ $(document).ready(function() {
 				aoData.push( { "name": "uploadFilter", "value": self.uploadFilter } );
 				$.getJSON( sSource, aoData, function (json) { 
 					fnCallback(json);
+					if (json.files) {
+						var areAnyFileImportsPending = false;
+						for (var i = 0; i < json.files.length; i++) {
+							//console.log(file);
+							var file = json.files[i];
+							if (file.import_status == 1)
+							{
+								areAnyFileImportsPending = true;
+							}
+						}
+						if (areAnyFileImportsPending) {
+							//alert("pending uploads, starting refresh on timer");
+							self.startRefreshingRecentUploads();
+						} else {
+							self.stopRefreshingRecentUploads();
+						}
+					}
 				} );
 			 }
 		});
@@ -121,6 +144,25 @@ $(document).ready(function() {
 		return recentUploadsTable;
 	};
 	
+	self.startRefreshingRecentUploads = function()
+	{
+		if (self.isRecentUploadsRefreshTimerActive()) { //Prevent multiple timers from running
+			return;
+		}
+		self.recentUploadsRefreshTimer = setTimeout("self.recentUploadsTable.fnDraw()", 3000);
+	};
+	
+	self.isRecentUploadsRefreshTimerActive = function()
+	{
+		return (self.recentUploadsRefreshTimer != null);
+	};
+	
+	self.stopRefreshingRecentUploads = function()
+	{
+		clearTimeout(self.recentUploadsRefreshTimer);
+		self.recentUploadsRefreshTimer = null;
+	};
+	
 	$("#upload_status_all").click(function() {
 		self.uploadFilter = "all";
 		self.recentUploadsTable.fnDraw();