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

CC-1665: Scheduled stream rebroadcasting and recording 

-use sessions to determine currently open object in Library
This commit is contained in:
Martin Konecny 2012-08-21 16:54:14 -04:00
parent 20cfd01f80
commit a1b91aebbd
6 changed files with 47 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
airtime_mvc/application/Bootstrap.php
View File

@ -12,7 +12,6 @@ require_once "DateHelper.php";
require_once "OsPath.php"; require_once "OsPath.php";
require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php'; require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
//DateTime in PHP 5.3.0+ need a default timezone set. Set to UTC initially //DateTime in PHP 5.3.0+ need a default timezone set. Set to UTC initially
//in case Application_Model_Preference::GetTimezone fails and creates needs to create //in case Application_Model_Preference::GetTimezone fails and creates needs to create
//a log entry. This log entry requires a call to date(), which then complains that //a log entry. This log entry requires a call to date(), which then complains that
@ -67,10 +66,10 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap
$baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl(); $baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
$baseDir = dirname($_SERVER['SCRIPT_FILENAME']); $baseDir = dirname($_SERVER['SCRIPT_FILENAME']);
$view->headScript()->appendFile($baseUrl.'/js/libs/jquery-1.7.2.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-1.7.2.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.18.custom.min.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/libs/jquery-ui-1.8.18.custom.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/libs/jquery.stickyPanel.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/qtip/jquery.qtip.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/sprintf/sprintf-0.7-beta1.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$view->headScript()->appendScript("var baseUrl='$baseUrl/'"); $view->headScript()->appendScript("var baseUrl='$baseUrl/'");

4
airtime_mvc/application/controllers/LibraryController.php
View File

@ -58,8 +58,10 @@ class LibraryController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
try { try {
if (isset($this->obj_sess->id)) { if (isset($this->obj_sess->id)) {
$objInfo = Application_Model_Playlist::getObjInfo($this->obj_sess->type); $objInfo = Application_Model_Library::getObjInfo($this->obj_sess->type);
Logging::log($this->obj_sess->id);
$obj = new $objInfo['className']($this->obj_sess->id); $obj = new $objInfo['className']($this->obj_sess->id);
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id); $user = new Application_Model_User($userInfo->id);

91
airtime_mvc/application/controllers/PlaylistController.php
View File

@ -2,8 +2,6 @@
class PlaylistController extends Zend_Controller_Action class PlaylistController extends Zend_Controller_Action
{ {
/*protected $pl_sess = null;
protected $bl_sess = null;*/
protected $obj_sess = null; protected $obj_sess = null;
public function init() public function init()
@ -30,16 +28,13 @@ class PlaylistController extends Zend_Controller_Action
->addActionContext('get-block-info', 'json') ->addActionContext('get-block-info', 'json')
->initContext(); ->initContext();
/*$this->pl_sess = new Zend_Session_Namespace(UI_PLAYLIST_SESSNAME);
$this->bl_sess = new Zend_Session_Namespace(UI_BLOCK_SESSNAME);*/
$this->obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME); $this->obj_sess = new Zend_Session_Namespace(UI_PLAYLISTCONTROLLER_OBJ_SESSNAME);
} }
private function getPlaylist($p_type) private function getPlaylist($p_type)
{ {
$obj = null; $obj = null;
$objInfo = Application_Model_Library::getObjInfo($p_type);
$objInfo = Application_Model_Playlist::getObjInfo($p_type);
if (isset($this->obj_sess->id)) { if (isset($this->obj_sess->id)) {
$obj = new $objInfo['className']($this->obj_sess->id); $obj = new $objInfo['className']($this->obj_sess->id);
@ -54,16 +49,6 @@ class PlaylistController extends Zend_Controller_Action
return $obj; return $obj;
} }
private function changePlaylist($p_id, $p_type)
{
if (is_null($p_id) || is_null($p_type)) {
unset($this->obj_sess->id);
unset($this->obj_sess->type);
} else {
$this->obj_sess->id = intval($p_id);
$this->obj_sess->type = $p_type;
}
}
private function createUpdateResponse($obj) private function createUpdateResponse($obj)
{ {
@ -133,7 +118,7 @@ class PlaylistController extends Zend_Controller_Action
$this->view->error = "{$p_type} not found"; $this->view->error = "{$p_type} not found";
Logging::log("{$p_type} not found"); Logging::log("{$p_type} not found");
$this->changePlaylist(null, $p_type); Application_Model_Library::changePlaylist(null, $p_type);
$this->createFullResponse(null); $this->createFullResponse(null);
} }
@ -163,71 +148,13 @@ class PlaylistController extends Zend_Controller_Action
$this->createFullResponse($obj); $this->createFullResponse($obj);
} }
public function indexAction()
{
global $CC_CONFIG;
$request = $this->getRequest();
$baseUrl = $request->getBaseUrl();
$this->view->headScript()->appendFile($baseUrl.'/js/blockui/jquery.blockUI.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/contextmenu/jquery.contextMenu.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/js/jquery.dataTables.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.pluginAPI.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.fnSetFilteringDelay.js?'.$CC_CONFIG['airtime_version'],'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColVis.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.ColReorder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/datatables/plugin/dataTables.FixedColumns.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/buttons/buttons.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/utilities/utilities.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/library.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($this->view->baseUrl('/js/airtime/library/events/library_playlistbuilder.js'), 'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/media_library.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'/css/jquery.contextMenu.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColVis.css?'.$CC_CONFIG['airtime_version']);
$this->view->headLink()->appendStylesheet($baseUrl.'/css/datatables/css/ColReorder.css?'.$CC_CONFIG['airtime_version']);
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headScript()->appendFile($baseUrl.'/js/airtime/playlist/smart_blockbuilder.js?'.$CC_CONFIG['airtime_version'], 'text/javascript');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']);
try {
if (isset($this->obj_sess->id)) {
$objInfo = Application_Model_Playlist::getObjInfo($this->obj_sess->type);
$obj = new $objInfo['className']($this->obj_sess->id);
$userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id);
$isAdminOrPM = $user->isUserType(array(UTYPE_ADMIN, UTYPE_PROGRAM_MANAGER));
if ($isAdminOrPM || $obj->getCreatorId() == $userInfo->id) {
$this->view->obj = $obj;
if ($this->obj_sess->type == "block") {
$form = new Application_Form_SmartBlockCriteria();
$form->startForm($this->obj_sess->id);
$this->view->form = $form;
}
}
$formatter = new LengthFormatter($obj->getLength());
$this->view->length = $formatter->format();
$this->view->type = $this->obj_sess->type;
}
} catch (PlaylistNotFoundException $e) {
$this->playlistNotFound($this->obj_sess->type);
} catch (Exception $e) {
$this->playlistUnknownError($e);
}
}
public function newAction() public function newAction()
{ {
//$pl_sess = $this->pl_sess; //$pl_sess = $this->pl_sess;
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$type = $this->_getParam('type'); $type = $this->_getParam('type');
$objInfo = Application_Model_Playlist::getObjInfo($type); $objInfo = Application_Model_Library::getObjInfo($type);
$name = 'Untitled Playlist'; $name = 'Untitled Playlist';
if ($type == 'block') { if ($type == 'block') {
@ -236,9 +163,9 @@ class PlaylistController extends Zend_Controller_Action
$obj = new $objInfo['className'](); $obj = new $objInfo['className']();
$obj->setName($name); $obj->setName($name);
$obj->setMetaData('dc:creator', $userInfo->id); $obj->setMetadata('dc:creator', $userInfo->id);
$this->changePlaylist($obj->getId(), $type); Application_Model_Library::changePlaylist($obj->getId(), $type);
$this->createFullResponse($obj); $this->createFullResponse($obj);
} }
@ -246,11 +173,11 @@ class PlaylistController extends Zend_Controller_Action
{ {
$id = $this->_getParam('id', null); $id = $this->_getParam('id', null);
$type = $this->_getParam('type'); $type = $this->_getParam('type');
$objInfo = Application_Model_Playlist::getObjInfo($type); $objInfo = Application_Model_Library::getObjInfo($type);
Logging::log("editing {$type} {$id}"); Logging::log("editing {$type} {$id}");
if (!is_null($id)) { if (!is_null($id)) {
$this->changePlaylist($id, $type); Application_Model_Library::changePlaylist($id, $type);
} }
try { try {
@ -271,7 +198,7 @@ class PlaylistController extends Zend_Controller_Action
$obj = null; $obj = null;
$objInfo = Application_Model_Playlist::getObjInfo($type); $objInfo = Application_Model_Library::getObjInfo($type);
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new Application_Model_User($userInfo->id); $user = new Application_Model_User($userInfo->id);
@ -280,7 +207,7 @@ class PlaylistController extends Zend_Controller_Action
Logging::log("Currently active {$type} {$this->obj_sess->id}"); Logging::log("Currently active {$type} {$this->obj_sess->id}");
if (in_array($this->obj_sess->id, $ids)) { if (in_array($this->obj_sess->id, $ids)) {
Logging::log("Deleting currently active {$type}"); Logging::log("Deleting currently active {$type}");
$this->changePlaylist(null, $type); Application_Model_Library::changePlaylist(null, $type);
} else { } else {
Logging::log("Not deleting currently active {$type}"); Logging::log("Not deleting currently active {$type}");
$obj = new $objInfo['className']($this->obj_sess->id); $obj = new $objInfo['className']($this->obj_sess->id);

4
airtime_mvc/application/models/Block.php
View File

@ -8,7 +8,7 @@ require_once 'formatters/LengthFormatter.php';
* @copyright 2010 Sourcefabric O.P.S. * @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt * @license http://www.gnu.org/licenses/gpl.txt
*/ */
class Application_Model_Block class Application_Model_Block implements Application_Model_LibraryEditable
{ {
/** /**
* propel connection object. * propel connection object.
@ -839,7 +839,7 @@ EOT;
return $this->$method(); return $this->$method();
} }
public function setMetaData($category, $value) public function setMetadata($category, $value)
{ {
$cat = $this->categories[$category]; $cat = $this->categories[$category];

43
airtime_mvc/application/models/Playlist.php
View File

@ -8,7 +8,7 @@ require_once 'formatters/LengthFormatter.php';
* @copyright 2010 Sourcefabric O.P.S. * @copyright 2010 Sourcefabric O.P.S.
* @license http://www.gnu.org/licenses/gpl.txt * @license http://www.gnu.org/licenses/gpl.txt
*/ */
class Application_Model_Playlist class Application_Model_Playlist implements Application_Model_LibraryEditable
{ {
/** /**
* propel connection object. * propel connection object.
@ -270,8 +270,8 @@ SQL;
} }
// returns true/false and ids of dynamic blocks // returns true/false and ids of dynamic blocks
public function hasDynamicBlock(){ public function hasDynamicBlock(){
$ids = $this->getIdsOfDynamicBlocks(); $ids = $this->getIdsOfDynamicBlocks();
if (count($ids) > 0) { if (count($ids) > 0) {
return true; return true;
} else { } else {
@ -280,10 +280,10 @@ SQL;
} }
public function getIdsOfDynamicBlocks() { public function getIdsOfDynamicBlocks() {
$sql = "SELECT bl.id FROM cc_playlistcontents as pc $sql = "SELECT bl.id FROM cc_playlistcontents as pc
JOIN cc_block as bl ON pc.type=2 AND pc.block_id=bl.id AND bl.type='dynamic' JOIN cc_block as bl ON pc.type=2 AND pc.block_id=bl.id AND bl.type='dynamic'
WHERE playlist_id={$this->id} AND pc.type=2"; WHERE playlist_id={$this->id} AND pc.type=2";
$r = $this->con->query($sql); $r = $this->con->query($sql);
$result = $r->fetchAll(PDO::FETCH_ASSOC); $result = $r->fetchAll(PDO::FETCH_ASSOC);
return $result; return $result;
} }
@ -425,7 +425,7 @@ SQL;
Logging::log("at position {$pos}"); Logging::log("at position {$pos}");
foreach ($p_items as $ac) { foreach ($p_items as $ac) {
$res = $this->insertPlaylistElement($this->buildEntry($ac, $pos)); $res = $this->insertPlaylistElement($this->buildEntry($ac, $pos));
$pos = $pos + 1; $pos = $pos + 1;
Logging::log("Adding $ac[1] $ac[0]"); Logging::log("Adding $ac[1] $ac[0]");
@ -835,7 +835,7 @@ SQL;
return $this->$method(); return $this->$method();
} }
public function setMetaData($category, $value) public function setMetadata($category, $value)
{ {
$cat = $this->categories[$category]; $cat = $this->categories[$category];
@ -890,26 +890,13 @@ SQL;
return $leftOvers; return $leftOvers;
} }
/** /**
* Delete all files from playlist * Delete all files from playlist
* @param int $p_playlistId * @param int $p_playlistId
*/ */
public function deleteAllFilesFromPlaylist() public function deleteAllFilesFromPlaylist()
{ {
CcPlaylistcontentsQuery::create()->findByDbPlaylistId($this->id)->delete(); CcPlaylistcontentsQuery::create()->findByDbPlaylistId($this->id)->delete();
}
public static function getObjInfo($p_type)
{
$info = array();
if (strcmp($p_type, 'playlist')==0) {
$info['className'] = 'Application_Model_Playlist';
} else {
$info['className'] = 'Application_Model_Block';
}
return $info;
} }
} // class Playlist } // class Playlist

25
airtime_mvc/application/models/Webstream.php
View File

@ -1,7 +1,7 @@
<?php <?php
class Application_Model_Webstream{ class Application_Model_Webstream implements Application_Model_LibraryEditable
{
private $id; private $id;
public function __construct($webstream) public function __construct($webstream)
@ -145,15 +145,6 @@ class Application_Model_Webstream{
$id = $parameters["id"]; $id = $parameters["id"];
if (!is_null($id)) {
// user has performed a create stream action instead of edit
// stream action. Check if user has the rights to edit this stream.
Logging::log("CREATE");
} else {
Logging::log("EDIT");
}
return array($valid, $mime, $di); return array($valid, $mime, $di);
} }
@ -168,6 +159,18 @@ class Application_Model_Webstream{
return true; return true;
} }
public function setMetadata($key, $val)
{
}
public function setName($name)
{
}
private static function discoverStreamMime($url) private static function discoverStreamMime($url)
{ {
$headers = get_headers($url); $headers = get_headers($url);