Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use track metadata from Airtime in playout engine

Browse source 
* Resolves CC-5893: Metadata not updated on Airtime Pro
* Report track metadata in the schedule API, and make pypo pass that
  along to Liquidsoap via annotations.
* Move HTTP response sanitization for file metadata out of the REST module and into CcFiles
* Slightly improved the terrible exception handling in pypo
This commit is contained in:
Albert Santoni 2014-07-15 16:32:48 -04:00
parent 1aa99e2896
commit 7438ecd2b4
5 changed files with 62 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
airtime_mvc/application/models/Schedule.php
View file

@ -738,13 +738,16 @@ SQL;
$replay_gain = is_null($item["replay_gain"]) ? "0": $item["replay_gain"];
$replay_gain += Application_Model_Preference::getReplayGainModifier();
if ( !Application_Model_Preference::GetEnableReplayGain() ) {
if (!Application_Model_Preference::GetEnableReplayGain() ) {
$replay_gain = 0;
}
$fileMetadata = CcFiles::sanitizeResponse(CcFilesQuery::create()->findPk($media_id));
$schedule_item = array(
'id' => $media_id,
'type' => 'file',
'metadata' => $fileMetadata,
'row_id' => $item["id"],
'uri' => $uri,
'fade_in' => Application_Model_Schedule::WallTimeToMillisecs($item["fade_in"]),

24
airtime_mvc/application/models/airtime/CcFiles.php
View file

@ -13,6 +13,14 @@
*/
class CcFiles extends BaseCcFiles {
//fields we should never expose through our RESTful API
private static $privateFields = array(
'file_exists',
'silan_check',
'is_scheduled',
'is_playlist'
);
public function getCueLength()
{
$cuein = $this->getDbCuein();
@ -46,4 +54,20 @@ class CcFiles extends BaseCcFiles {
$this->save();
}
/**
*
* Strips out the private fields we do not want to send back in API responses
* @param $file a CcFiles object
*/
//TODO: rename this function?
public static function sanitizeResponse($file)
{
$response = $file->toArray(BasePeer::TYPE_FIELDNAME);
foreach (self::$privateFields as $key) {
unset($response[$key]);
}
return $response;
}
} // CcFiles

37
airtime_mvc/application/modules/rest/controllers/MediaController.php
View file

@ -4,7 +4,7 @@
class Rest_MediaController extends Zend_Rest_Controller
{
//fields that are not modifiable via our RESTful API
private $blackList = array(
private static $blackList = array(
'id',
'directory',
'filepath',
@ -18,14 +18,6 @@ class Rest_MediaController extends Zend_Rest_Controller
'is_playlist'
);
//fields we should never expose through our RESTful API
private $privateFields = array(
'file_exists',
'silan_check',
'is_scheduled',
'is_playlist'
);
public function init()
{
$this->view->layout()->disableLayout();
@ -41,7 +33,7 @@ class Rest_MediaController extends Zend_Rest_Controller
$files_array = array();
foreach (CcFilesQuery::create()->find() as $file)
{
array_push($files_array, $this->sanitizeResponse($file));
array_push($files_array, CcFiles::sanitizeResponse($file));
}
$this->getResponse()
@ -134,7 +126,7 @@ class Rest_MediaController extends Zend_Rest_Controller
$this->getResponse()
->setHttpResponseCode(200)
->appendBody(json_encode($this->sanitizeResponse($file)));
->appendBody(json_encode(CcFiles::sanitizeResponse($file)));
} else {
$this->fileNotFoundResponse();
}
@ -201,7 +193,7 @@ class Rest_MediaController extends Zend_Rest_Controller
$this->getResponse()
->setHttpResponseCode(201)
->appendBody(json_encode($this->sanitizeResponse($file)));
->appendBody(json_encode(CcFiles::sanitizeResponse($file)));
}
}
@ -265,7 +257,7 @@ class Rest_MediaController extends Zend_Rest_Controller
$this->getResponse()
->setHttpResponseCode(200)
->appendBody(json_encode($this->sanitizeResponse($file)));
->appendBody(json_encode(CcFiles::sanitizeResponse($file)));
} else {
$file->setDbImportStatus(2)->save();
$this->fileNotFoundResponse();
@ -490,30 +482,15 @@ class Rest_MediaController extends Zend_Rest_Controller
* from outside of Airtime
* @param array $data
*/
private function removeBlacklistedFieldsFromRequestData($data)
private static function removeBlacklistedFieldsFromRequestData($data)
{
foreach ($this->blackList as $key) {
foreach (self::$blackList as $key) {
unset($data[$key]);
}
return $data;
}
/**
*
* Strips out the private fields we do not want to send back in API responses
*/
//TODO: rename this function?
public function sanitizeResponse($file)
{
$response = $file->toArray(BasePeer::TYPE_FIELDNAME);
foreach ($this->privateFields as $key) {
unset($response[$key]);
}
return $response;
}
private function removeEmptySubFolders($path)
{