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

SAAS-503: PYPO -> Use the REST API to download files

Browse source 
Removed Amazon S3 specific code
This commit is contained in:
drigato 2014-12-02 18:46:17 -05:00
parent bf91677f91
commit e1f1807f5a
3 changed files with 43 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -771,9 +771,8 @@ SQL;
* @param Array $item schedule info about one track
* @param Integer $media_id scheduled item's cc_files id
* @param String $uri path to the scheduled item's physical location
* @param String $amazonS3ResourceId scheduled item's Amazon S3 resource id, if applicable
*/
private static function createFileScheduleEvent(&$data, $item, $media_id, $uri, $amazonS3ResourceId)
private static function createFileScheduleEvent(&$data, $item, $media_id, $uri, $downloadURL, $filesize)
{
$start = self::AirtimeTimeToPypoTime($item["start"]);
$end = self::AirtimeTimeToPypoTime($item["end"]);
@ -807,11 +806,10 @@ SQL;
'end' => $end,
'show_name' => $item["show_name"],
'replay_gain' => $replay_gain,
'independent_event' => $independent_event
'independent_event' => $independent_event,
'download_url' => $downloadURL,
'filesize' => $filesize,
);
if (!is_null($amazonS3ResourceId)) {
$schedule_item["amazonS3_resource_id"] = $amazonS3ResourceId;
}
if ($schedule_item['cue_in'] > $schedule_item['cue_out']) {
$schedule_item['cue_in'] = $schedule_item['cue_out'];
@ -945,9 +943,11 @@ SQL;
$storedFile = Application_Model_StoredFile::RecallById($media_id);
$file = $storedFile->getPropelOrm();
$uri = $file->getAbsoluteFilePath();
// TODO: fix this URL
$downloadURL = "http://localhost/rest/media/$media_id/download";
$filesize = $file->getFileSize();
$amazonS3ResourceId = $file->getResourceId();
self::createFileScheduleEvent($data, $item, $media_id, $uri, $amazonS3ResourceId);
self::createFileScheduleEvent($data, $item, $media_id, $uri, $downloadURL, $filesize);
}
elseif (!is_null($item['stream_id'])) {
//row is type "webstream"