From f4ea417b83a5463e8136e71b4eae1fb82c9b9514 Mon Sep 17 00:00:00 2001 From: Albert Santoni Date: Thu, 13 Mar 2014 12:12:12 -0400 Subject: [PATCH] CC-5709: Airtime Analyzer * Renamed a function in MediaController for clarity * Updated airtime_analyzer README --- .../application/modules/rest/controllers/MediaController.php | 4 ++-- python_apps/airtime_analyzer/README.rst | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/modules/rest/controllers/MediaController.php b/airtime_mvc/application/modules/rest/controllers/MediaController.php index 83269de35..d7bd9132c 100644 --- a/airtime_mvc/application/modules/rest/controllers/MediaController.php +++ b/airtime_mvc/application/modules/rest/controllers/MediaController.php @@ -66,7 +66,7 @@ class Rest_MediaController extends Zend_Rest_Controller return; } - $this->processUpload(); + $this->processUploadedFile(); //TODO: Strip or sanitize the JSON output $file = new CcFiles(); @@ -179,7 +179,7 @@ class Rest_MediaController extends Zend_Rest_Controller $resp->appendBody("ERROR: Media not found."); } - private function processUpload() + private function processUploadedFile() { $upload_dir = ini_get("upload_tmp_dir") . DIRECTORY_SEPARATOR . "plupload"; $tempFilePath = Application_Model_StoredFile::uploadFile($upload_dir); diff --git a/python_apps/airtime_analyzer/README.rst b/python_apps/airtime_analyzer/README.rst index 18b6e5aaf..ffd0c8ef8 100644 --- a/python_apps/airtime_analyzer/README.rst +++ b/python_apps/airtime_analyzer/README.rst @@ -33,8 +33,7 @@ directory for convenience. This is super easy to do, just run: To send an test message to airtime_analyzer, you can use the message_sender.php script in the tools directory. For example, run: - $ php tools/message_sender.php '{ "tmp_file_path" : "foo.mp3" }' - + $ php tools/message_sender.php '{ "tmp_file_path" : "foo.mp3", "final_directory" : ".", "callback_url" : "http://airtime.localhost/rest/media/1", "api_key" : "YOUR_API_KEY" }' Logging =========