CC-5709: Airtime Analyzer

* Overhauled Add Media screen, now shows state of recent uploads
* Dropped old unused "state" column, added new file_import column to cc_files
* New PluploadController methods
* Save the filename as the track title for unprocessed uploads
* Hide pending files from the library until they've been processed.
* Don't overwrite files with duplicate names, we rename them instead.

airtime_mvc/application/controllers/PluploadController.php

@@ -2,12 +2,11 @@
 
 class PluploadController extends Zend_Controller_Action
 {
-
     public function init()
     {
         $ajaxContext = $this->_helper->getHelper('AjaxContext');
         $ajaxContext->addActionContext('upload',            'json')
-                    ->addActionContext('uploadFinished',    'json')
+                    ->addActionContext('recent-uploads',     'json')
                     ->initContext();
     }
 
@@ -18,12 +17,14 @@ class PluploadController extends Zend_Controller_Action
         $baseUrl = Application_Common_OsPath::getBaseDir();
         $locale = Application_Model_Preference::GetLocale();
 
+        $this->view->headScript()->appendFile($baseUrl.'js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/plupload/plupload.full.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/plupload/jquery.plupload.queue.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/airtime/library/plupload.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
         $this->view->headScript()->appendFile($baseUrl.'js/plupload/i18n/'.$locale.'.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
 
         $this->view->headLink()->appendStylesheet($baseUrl.'css/plupload.queue.css?'.$CC_CONFIG['airtime_version']);
+        $this->view->headLink()->appendStylesheet($baseUrl.'css/addmedia.css?'.$CC_CONFIG['airtime_version']);
     }
 
     public function uploadAction()
@@ -34,31 +35,43 @@ class PluploadController extends Zend_Controller_Action
 
         $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "tempfilepath" => $tempFileName));
     }
-
-    public function uploadFinishedAction()
+    
+    public function recentUploadsAction()
     {
-        $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
-        $filename = $this->_getParam('name');
-        $tempname = $this->_getParam('tempname');
-        $result = Application_Model_StoredFile::importUploadedFile($upload_dir, $filename, $tempname);
-        if (!is_null($result))
-            $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "error" => $result));
+        //$this->dis
+        //( $_GET['iDisplayStart'] ) && $_GET['iDisplayLength'] != '-1' )
+        $limit = isset($_GET['iDisplayLength']) ? $_GET['iDisplayLength'] : 10;
+        $rowStart = isset($_GET['iDisplayStart']) ? $_GET['iDisplayStart'] : 0;
         
-        $this->_helper->json->sendJson(array("jsonrpc" => "2.0"));
+        $recentUploads = CcFilesQuery::create()->filterByDbUtime(array('min' => time() - 30 * 24 * 60 * 60))
+                            ->orderByDbUtime(Criteria::DESC)
+                            ->offset($rowStart)
+                            ->limit($limit)
+                            ->find();
         
+        $numRecentUploads = $limit;
+        
+        $numTotalRecentUploads = CcFilesQuery::create()->filterByDbUtime(array('min' => time() - 30 * 24 * 60 * 60))
+            ->count();
+        
+        //$this->_helper->json->sendJson(array("jsonrpc" => "2.0", "tempfilepath" => $tempFileName));
+        
+        $uploadsArray = array();
+        
+        foreach ($recentUploads as $upload)
+        {
+            $upload->toArray(BasePeer::TYPE_FIELDNAME);
+            //array_push($uploadsArray, $upload); //TODO: $this->sanitizeResponse($upload));
+            
+            //$this->_helper->json->sendJson($upload->asJson());
+            array_push($uploadsArray, $upload->toArray(BasePeer::TYPE_FIELDNAME));
+        }
+        
+
+        $this->view->sEcho = intval($this->getRequest()->getParam('sEcho'));
+        $this->view->iTotalDisplayRecords = $numTotalRecentUploads;
+        //$this->view->iTotalDisplayRecords = $numRecentUploads; //$r["iTotalDisplayRecords"];
+        $this->view->iTotalRecords = $numTotalRecentUploads; //$r["iTotalRecords"];
+        $this->view->files = $uploadsArray; //$r["aaData"];
     }
-    /* FIXME: I renamed this guy to uploadFinishedAction and am just starting to rewrite it to use the new File API.
-     *        -- Albert March 10, 2014
-    public function copyfileAction()
-    {
-        $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload";
-        $filename = $this->_getParam('name');
-        $tempname = $this->_getParam('tempname');
-        $result = Application_Model_StoredFile::copyFileToStor($upload_dir,
-            $filename, $tempname);
-        if (!is_null($result))
-           $this->_helper->json->sendJson(array("jsonrpc" => "2.0", "error" => $result));
-
-        $this->_helper->json->sendJson(array("jsonrpc" => "2.0"));
-    }*/
 }

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

@@ -43,7 +43,7 @@ class Rest_MediaController extends Zend_Rest_Controller
         
         $this->getResponse()
         ->setHttpResponseCode(200)
-        ->appendBody(json_encode($files_array));       
+        ->appendBody(json_encode($files_array));
         
         /** TODO: Use this simpler code instead after we upgrade to Propel 1.7 (Airtime 2.6.x branch):
         $this->getResponse()
@@ -121,8 +121,10 @@ class Rest_MediaController extends Zend_Rest_Controller
         $file->fromArray($this->validateRequestData($this->getRequest()->getPost()));
         $file->setDbOwnerId($this->getOwnerId());
         $now  = new DateTime("now", new DateTimeZone("UTC"));
+        $file->setDbTrackTitle($_FILES["file"]["name"]);
         $file->setDbUtime($now);
         $file->setDbMtime($now);
+        $file->setDbHidden(true);
         $file->save();
         
         $callbackUrl = $this->getRequest()->getScheme() . '://' . $this->getRequest()->getHttpHost() . $this->getRequest()->getRequestUri() . "/" . $file->getPrimaryKey();
@@ -170,7 +172,7 @@ class Rest_MediaController extends Zend_Rest_Controller
                     $file->setDbDirectory(1); //1 corresponds to the default stor/imported directory.
                 }
             }    
-
+            
             $now  = new DateTime("now", new DateTimeZone("UTC"));
             $file->setDbMtime($now);
             $file->save();

airtime_mvc/application/views/scripts/plupload/index.phtml

@@ -9,3 +9,19 @@
 <div id="plupload_error">
 	<table></table>
 </div>
+
+<div id="recent_uploads_wrapper" class="lib-content ui-widget ui-widget-content block-shadow alpha-block">
+    <div id="recent_uploads" class="padded">
+    
+            <div id="recent_uploads_filter">
+            <form>
+                <input type="radio" name="upload_status" id="upload_status_all" checked></input><label for="upload_status_all">All</label>
+                <input type="radio" name="upload_status" id="upload_status_failed"></input><label for="upload_status_failed">Failed</label>
+                <input type="radio" name="upload_status" id="upload_status_pending"></input><label for="upload_status_pending">Pending</label>
+            </form>        
+        </div>
+        <H2>Recent Uploads</H2>
+        <table id="recent_uploads_table" class="lib-content ui-widget ui-widget-content block-shadow alpha-block "></table>
+    </div>
+    <div style="clear: both;"></div>
+</div>