From 15552319aa9d31f762b4ef20665ea77652f70335 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 28 Feb 2012 13:47:57 -0500 Subject: [PATCH 01/12] CC-3230: Show appropriate error message if disk is full when attempting to upload files via the web UI - updated formating of file, removed tabs in favour of four spaces for some lines. --- airtime_mvc/application/models/StoredFile.php | 369 +++++++++--------- 1 file changed, 184 insertions(+), 185 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index b88a58430..c795b2ccf 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -82,7 +82,7 @@ class Application_Model_StoredFile { * @param array $p_md * example: $p_md['MDATA_KEY_URL'] = 'http://www.fake.com' */ - public function setMetadata($p_md=null) + public function setMetadata($p_md=null) { if (is_null($p_md)) { $this->setDbColMetadata(); @@ -105,7 +105,7 @@ class Application_Model_StoredFile { * @param array $p_md * example: $p_md['url'] = 'http://www.fake.com' */ - public function setDbColMetadata($p_md=null) + public function setDbColMetadata($p_md=null) { if (is_null($p_md)) { foreach ($this->_dbMD as $dbColumn => $propelColumn) { @@ -627,7 +627,7 @@ class Application_Model_StoredFile { $fromTable = $unionTable; } - $results = Application_Model_StoredFile::searchFiles($displayColumns, $fromTable, $datatables); + $results = Application_Model_StoredFile::searchFiles($displayColumns, $fromTable, $datatables); foreach ($results['aaData'] as &$row) { @@ -666,77 +666,77 @@ class Application_Model_StoredFile { return $results; } - public static function searchFiles($displayColumns, $fromTable, $data) - { - $con = Propel::getConnection(CcFilesPeer::DATABASE_NAME); + public static function searchFiles($displayColumns, $fromTable, $data) + { + $con = Propel::getConnection(CcFilesPeer::DATABASE_NAME); $where = array(); - - if ($data["sSearch"] !== "") { - $searchTerms = explode(" ", $data["sSearch"]); - } - - $selectorCount = "SELECT COUNT(*) "; - $selectorRows = "SELECT ".join(",", $displayColumns)." "; - + + if ($data["sSearch"] !== "") { + $searchTerms = explode(" ", $data["sSearch"]); + } + + $selectorCount = "SELECT COUNT(*) "; + $selectorRows = "SELECT ".join(",", $displayColumns)." "; + $sql = $selectorCount." FROM ".$fromTable; $sqlTotalRows = $sql; - - if (isset($searchTerms)) { - $searchCols = array(); - for ($i = 0; $i < $data["iColumns"]; $i++) { - if ($data["bSearchable_".$i] == "true") { - $searchCols[] = $data["mDataProp_{$i}"]; - } - } - - $outerCond = array(); - - foreach ($searchTerms as $term) { - $innerCond = array(); - - foreach ($searchCols as $col) { + + if (isset($searchTerms)) { + $searchCols = array(); + for ($i = 0; $i < $data["iColumns"]; $i++) { + if ($data["bSearchable_".$i] == "true") { + $searchCols[] = $data["mDataProp_{$i}"]; + } + } + + $outerCond = array(); + + foreach ($searchTerms as $term) { + $innerCond = array(); + + foreach ($searchCols as $col) { $escapedTerm = pg_escape_string($term); - $innerCond[] = "{$col}::text ILIKE '%{$escapedTerm}%'"; - } - $outerCond[] = "(".join(" OR ", $innerCond).")"; - } - $where[] = "(".join(" AND ", $outerCond).")"; - } - // End Where clause - - // Order By clause - $orderby = array(); - for ($i = 0; $i < $data["iSortingCols"]; $i++){ - $num = $data["iSortCol_".$i]; - $orderby[] = $data["mDataProp_{$num}"]." ".$data["sSortDir_".$i]; - } - $orderby[] = "id"; - $orderby = join("," , $orderby); - // End Order By clause - - if (count($where) > 0) { - $where = join(" AND ", $where); - $sql = $selectorCount." FROM ".$fromTable." WHERE ".$where; - $sqlTotalDisplayRows = $sql; - - $sql = $selectorRows." FROM ".$fromTable." WHERE ".$where." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; - } - else { - $sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; - } - + $innerCond[] = "{$col}::text ILIKE '%{$escapedTerm}%'"; + } + $outerCond[] = "(".join(" OR ", $innerCond).")"; + } + $where[] = "(".join(" AND ", $outerCond).")"; + } + // End Where clause + + // Order By clause + $orderby = array(); + for ($i = 0; $i < $data["iSortingCols"]; $i++){ + $num = $data["iSortCol_".$i]; + $orderby[] = $data["mDataProp_{$num}"]." ".$data["sSortDir_".$i]; + } + $orderby[] = "id"; + $orderby = join("," , $orderby); + // End Order By clause + + if (count($where) > 0) { + $where = join(" AND ", $where); + $sql = $selectorCount." FROM ".$fromTable." WHERE ".$where; + $sqlTotalDisplayRows = $sql; + + $sql = $selectorRows." FROM ".$fromTable." WHERE ".$where." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; + } + else { + $sql = $selectorRows." FROM ".$fromTable." ORDER BY ".$orderby." OFFSET ".$data["iDisplayStart"]." LIMIT ".$data["iDisplayLength"]; + } + try { - $r = $con->query($sqlTotalRows); - $totalRows = $r->fetchColumn(0); - - if (isset($sqlTotalDisplayRows)) { - $r = $con->query($sqlTotalDisplayRows); - $totalDisplayRows = $r->fetchColumn(0); - } - else { - $totalDisplayRows = $totalRows; - } - + $r = $con->query($sqlTotalRows); + $totalRows = $r->fetchColumn(0); + + if (isset($sqlTotalDisplayRows)) { + $r = $con->query($sqlTotalDisplayRows); + $totalDisplayRows = $r->fetchColumn(0); + } + else { + $totalDisplayRows = $totalRows; + } + $r = $con->query($sql); $r->setFetchMode(PDO::FETCH_ASSOC); $results = $r->fetchAll(); @@ -744,109 +744,109 @@ class Application_Model_StoredFile { catch (Exception $e) { Logging::log($e->getMessage()); } - - //display sql executed in airtime log for testing - Logging::log($sql); - - return array("sEcho" => intval($data["sEcho"]), "iTotalDisplayRecords" => $totalDisplayRows, "iTotalRecords" => $totalRows, "aaData" => $results); - } + + //display sql executed in airtime log for testing + Logging::log($sql); + + return array("sEcho" => intval($data["sEcho"]), "iTotalDisplayRecords" => $totalDisplayRows, "iTotalRecords" => $totalRows, "aaData" => $results); + } public static function uploadFile($p_targetDir) { // HTTP headers for no cache etc - header('Content-type: text/plain; charset=UTF-8'); - header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); - header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); - header("Cache-Control: no-store, no-cache, must-revalidate"); - header("Cache-Control: post-check=0, pre-check=0", false); - header("Pragma: no-cache"); - - // Settings - $cleanupTargetDir = false; // Remove old files - $maxFileAge = 60 * 60; // Temp file age in seconds - - // 5 minutes execution time - @set_time_limit(5 * 60); - // usleep(5000); - - // Get parameters - $chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0; - $chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0; - $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : ''; + header('Content-type: text/plain; charset=UTF-8'); + header("Expires: Mon, 26 Jul 1997 05:00:00 GMT"); + header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT"); + header("Cache-Control: no-store, no-cache, must-revalidate"); + header("Cache-Control: post-check=0, pre-check=0", false); + header("Pragma: no-cache"); + + // Settings + $cleanupTargetDir = false; // Remove old files + $maxFileAge = 60 * 60; // Temp file age in seconds + + // 5 minutes execution time + @set_time_limit(5 * 60); + // usleep(5000); + + // Get parameters + $chunk = isset($_REQUEST["chunk"]) ? $_REQUEST["chunk"] : 0; + $chunks = isset($_REQUEST["chunks"]) ? $_REQUEST["chunks"] : 0; + $fileName = isset($_REQUEST["name"]) ? $_REQUEST["name"] : ''; Logging::log(__FILE__.":uploadFile(): filename=$fileName to $p_targetDir"); - // Clean the fileName for security reasons + // Clean the fileName for security reasons //this needs fixing for songs not in ascii. - //$fileName = preg_replace('/[^\w\._]+/', '', $fileName); - - // Create target dir - if (!file_exists($p_targetDir)) - @mkdir($p_targetDir); - - // Remove old temp files - if (is_dir($p_targetDir) && ($dir = opendir($p_targetDir))) { - while (($file = readdir($dir)) !== false) { - $filePath = $p_targetDir . DIRECTORY_SEPARATOR . $file; - - // Remove temp files if they are older than the max age - if (preg_match('/\.tmp$/', $file) && (filemtime($filePath) < time() - $maxFileAge)) - @unlink($filePath); - } - - closedir($dir); - } else - die('{"jsonrpc" : "2.0", "error" : {"code": 100, "message": "Failed to open temp directory."}, "id" : "id"}'); - - // Look for the content type header - if (isset($_SERVER["HTTP_CONTENT_TYPE"])) - $contentType = $_SERVER["HTTP_CONTENT_TYPE"]; - - if (isset($_SERVER["CONTENT_TYPE"])) - $contentType = $_SERVER["CONTENT_TYPE"]; + //$fileName = preg_replace('/[^\w\._]+/', '', $fileName); + + // Create target dir + if (!file_exists($p_targetDir)) + @mkdir($p_targetDir); + + // Remove old temp files + if (is_dir($p_targetDir) && ($dir = opendir($p_targetDir))) { + while (($file = readdir($dir)) !== false) { + $filePath = $p_targetDir . DIRECTORY_SEPARATOR . $file; + + // Remove temp files if they are older than the max age + if (preg_match('/\.tmp$/', $file) && (filemtime($filePath) < time() - $maxFileAge)) + @unlink($filePath); + } + + closedir($dir); + } else + die('{"jsonrpc" : "2.0", "error" : {"code": 100, "message": "Failed to open temp directory."}, "id" : "id"}'); + + // Look for the content type header + if (isset($_SERVER["HTTP_CONTENT_TYPE"])) + $contentType = $_SERVER["HTTP_CONTENT_TYPE"]; + + if (isset($_SERVER["CONTENT_TYPE"])) + $contentType = $_SERVER["CONTENT_TYPE"]; // create temp file name (CC-3086) // we are not using mktemp command anymore. // plupload support unique_name feature. $tempFilePath= $p_targetDir . DIRECTORY_SEPARATOR . $fileName; - if (strpos($contentType, "multipart") !== false) { - if (isset($_FILES['file']['tmp_name']) && is_uploaded_file($_FILES['file']['tmp_name'])) { - // Open temp file - $out = fopen($tempFilePath, $chunk == 0 ? "wb" : "ab"); - if ($out) { - // Read binary input stream and append it to temp file - $in = fopen($_FILES['file']['tmp_name'], "rb"); - - if ($in) { - while ($buff = fread($in, 4096)) - fwrite($out, $buff); - } else - die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}'); - - fclose($out); - unlink($_FILES['file']['tmp_name']); - } else - die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}'); - } else - die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file."}, "id" : "id"}'); - } else { - // Open temp file - $out = fopen($tempFilePath, $chunk == 0 ? "wb" : "ab"); - if ($out) { - // Read binary input stream and append it to temp file - $in = fopen("php://input", "rb"); - - if ($in) { - while ($buff = fread($in, 4096)) - fwrite($out, $buff); - } else - die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}'); - - fclose($out); - } else - die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}'); - } - - return $tempFilePath; + if (strpos($contentType, "multipart") !== false) { + if (isset($_FILES['file']['tmp_name']) && is_uploaded_file($_FILES['file']['tmp_name'])) { + // Open temp file + $out = fopen($tempFilePath, $chunk == 0 ? "wb" : "ab"); + if ($out) { + // Read binary input stream and append it to temp file + $in = fopen($_FILES['file']['tmp_name'], "rb"); + + if ($in) { + while ($buff = fread($in, 4096)) + fwrite($out, $buff); + } else + die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}'); + + fclose($out); + unlink($_FILES['file']['tmp_name']); + } else + die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}'); + } else + die('{"jsonrpc" : "2.0", "error" : {"code": 103, "message": "Failed to move uploaded file."}, "id" : "id"}'); + } else { + // Open temp file + $out = fopen($tempFilePath, $chunk == 0 ? "wb" : "ab"); + if ($out) { + // Read binary input stream and append it to temp file + $in = fopen("php://input", "rb"); + + if ($in) { + while ($buff = fread($in, 4096)) + fwrite($out, $buff); + } else + die('{"jsonrpc" : "2.0", "error" : {"code": 101, "message": "Failed to open input stream."}, "id" : "id"}'); + + fclose($out); + } else + die('{"jsonrpc" : "2.0", "error" : {"code": 102, "message": "Failed to open output stream."}, "id" : "id"}'); + } + + return $tempFilePath; } /** @@ -873,8 +873,8 @@ class Application_Model_StoredFile { $md5 = md5_file($audio_file); $duplicate = Application_Model_StoredFile::RecallByMd5($md5); if ($duplicate) { - if (PEAR::isError($duplicate)) { - $result = array("code" => 105, "message" => $duplicate->getMessage()); + if (PEAR::isError($duplicate)) { + $result = array("code" => 105, "message" => $duplicate->getMessage()); } if (file_exists($duplicate->getFilePath())) { $duplicateName = $duplicate->getMetadataValue('MDATA_KEY_TITLE'); @@ -882,36 +882,35 @@ class Application_Model_StoredFile { } } - if (!isset($result)){//The file has no duplicate, so procceed to copy. - $storDir = Application_Model_MusicDir::getStorDir(); - $stor = $storDir->getDirectory(); + if (!isset($result)){//The file has no duplicate, so procceed to copy. + $storDir = Application_Model_MusicDir::getStorDir(); + $stor = $storDir->getDirectory(); - //check to see if there is enough space in $stor to continue. - $result = Application_Model_StoredFile::checkForEnoughDiskSpaceToCopy($stor, $audio_file); - if (!isset($result)){//if result not set then there's enough disk space to copy the file over - $stor .= "/organize"; - $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName; + //check to see if there is enough space in $stor to continue. + $result = Application_Model_StoredFile::checkForEnoughDiskSpaceToCopy($stor, $audio_file); + if (!isset($result)){//if result not set then there's enough disk space to copy the file over + $stor .= "/organize"; + $audio_stor = $stor . DIRECTORY_SEPARATOR . $fileName; - Logging::log("copyFileToStor: moving file $audio_file to $audio_stor"); - //Martin K.: changed to rename: Much less load + quicker since this is an atomic operation - $r = @rename($audio_file, $audio_stor); - - if ($r === false) { - #something went wrong likely there wasn't enough space in the audio_stor to move the file too. - #warn the user that the file wasn't uploaded and they should check if there is enough disk space. - unlink($audio_file);//remove the file from the organize after failed rename - $result = array("code" => 108, "message" => "The file was not uploaded, this error will occur if the computer hard drive does not have enough disk space."); - - } - } - } - return $result; + Logging::log("copyFileToStor: moving file $audio_file to $audio_stor"); + //Martin K.: changed to rename: Much less load + quicker since this is an atomic operation + $r = @rename($audio_file, $audio_stor); + + if ($r === false) { + #something went wrong likely there wasn't enough space in the audio_stor to move the file too. + #warn the user that the file wasn't uploaded and they should check if there is enough disk space. + unlink($audio_file);//remove the file from the organize after failed rename + $result = array("code" => 108, "message" => "The file was not uploaded, this error will occur if the computer hard drive does not have enough disk space."); + } + } + } + return $result; } public static function getFileCount() { - global $CC_CONFIG, $CC_DBC; + global $CC_CONFIG, $CC_DBC; $sql = "SELECT count(*) as cnt FROM ".$CC_CONFIG["filesTable"]; return $CC_DBC->GetOne($sql); } From 6ff24bd1fd748921c63854df888c7931e07282a1 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 8 Feb 2012 11:55:08 -0500 Subject: [PATCH 02/12] Updated Library logic so I can play a song in the library. Still need to be able to get the song file from the element and update the playlist builder so its player respects cuein/cueout and fadein/fadeout --- airtime_mvc/public/js/airtime/library/library.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 42aa267ef..355b76a37 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -620,4 +620,4 @@ function addQtipToSCIcons(){ }); } }); -} \ No newline at end of file +} From dd3b7afff2e13c416e0022d86034e0c462318508 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 8 Feb 2012 12:09:41 -0500 Subject: [PATCH 03/12] Updated library so I can play a song. --- airtime_mvc/application/controllers/LibraryController.php | 4 ++-- airtime_mvc/public/js/airtime/library/library.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 64d411086..99ad6f765 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -90,8 +90,8 @@ class LibraryController extends Zend_Controller_Action } $menu["edit"] = array("name"=> "Edit Metadata", "icon" => "edit", "url" => "/library/edit-file-md/id/{$id}"); - - if ($user->isAdmin()) { + + if ($user->isAdmin()) { $menu["del"] = array("name"=> "Delete", "icon" => "delete", "url" => "/library/delete"); } diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 355b76a37..42aa267ef 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -620,4 +620,4 @@ function addQtipToSCIcons(){ }); } }); -} +} \ No newline at end of file From 0b9ed43e50b5c294bcad40ebbc2c9d5cc1f39507 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 10 Feb 2012 18:37:10 -0500 Subject: [PATCH 04/12] Updated library functionality and started with playlist work. --- airtime_mvc/application/models/StoredFile.php | 6 ++- .../views/scripts/playlist/update.phtml | 6 ++- .../js/airtime/dashboard/helperfunctions.js | 45 +++++++++++++++++++ 3 files changed, 53 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index c795b2ccf..aee765c85 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -655,8 +655,10 @@ class Application_Model_StoredFile { //TODO url like this to work on both playlist/showbuilder screens. //datatable stuff really needs to be pulled out and generalized within the project //access to zend view methods to access url helpers is needed. - if ($type == "au") { - $row['image'] = ''; + + if($type == "au") { + $audioFile = $audioResults[$row['id']-1]['gunid'].".".pathinfo($audioResults[$row['id']-1]['filepath'], PATHINFO_EXTENSION); + $row['image'] = ''; } else { $row['image'] = ''; diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index 24ddd0882..3159530f3 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -7,8 +7,10 @@ if (count($items)) : ?>
  • " unqid="">
    ', - 'spl_')"> + accesskey=onClick="playlistAudioPreviewEditor( + '', '');"> +
    diff --git a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js index ccedc28e9..f4516ea2c 100644 --- a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js +++ b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js @@ -188,6 +188,51 @@ function audioStream(){ }); } +function playlistAudioPreviewEditor(filename, elemIndexString){ + + elemIndex =parseInt(elemIndexString)+1;//increment the index as tags start from 1 not 0 + console.log("hello world with index "+elemIndex); + + + var cueIn = $("dd[id^=spl_cue_in_"+elemIndex+"]").find('span').html(); + console.log(cueIn); + + var cueOut = $("dd[id^=spl_cue_out_"+elemIndex+"]").find('span').html(); + console.log("The cueOut is "+cueOut); + + var fadeIn = $("dd[id^=spl_fade_in_"+elemIndex+"]").find('span').html(); + if (fadeIn == undefined){ console.log("undefined fadein"); fadeIn = $("dd[id^=spl_fade_in_main]").find('span').html();} + console.log("The fadeIn is "+fadeIn); + + var fadeInFileName = ""; + if (fadeIn != undefined && parseInt(fadeIn) > 0 ){ + //need to get the previous element in the playlist...but don't support previous playlist fading becuase thats not possible. + + } + console.log("The fadeInFileName is "+fadeInFileName); + + var fadeOut = $("dd[id^=spl_fade_out_"+elemIndex+"]").find('span').html(); + if (fadeOut == undefined){ console.log("undefined fadeout"); fadeOut = $("dd[id^=spl_fade_out_main]").find('span').html();} + console.log("The fadeOut is "+fadeOut); + + var fadeOutFileName = ""; + if (fadeOut != undefined && parseInt(fadeOut) > 0 ){ + //need to get the next element in the playlist...but don't support next playlist fading becuase thats not possible. + + } + console.log("The fadeOutFileName is "+fadeOutFileName); + + //Pop out a play list with cue in and cue out set. + console.log(baseUrl+"Dashboard/audio-preview-player"); + //window.open(baseUrl+"Dashboard/audio-preview-player", "music player", "width=200,height=200"); + event.preventDefault(); + + //Set the play button to pause. + var elemID = "spl_"+elemIndexString; + $('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause"); + +} + function audioPreview(filename, elemID){ var elems = $('.ui-icon.ui-icon-pause'); From 1aab6821044abfda6d945306fe12005d32a55707 Mon Sep 17 00:00:00 2001 From: Daniel Date: Tue, 14 Feb 2012 15:43:27 -0500 Subject: [PATCH 05/12] CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) - updates to audio preview on library and playlist --- airtime_mvc/application/Bootstrap.php | 3 +- .../controllers/PlaylistController.php | 27 ++++++ airtime_mvc/application/models/StoredFile.php | 2 - .../views/scripts/playlist/update.phtml | 7 +- .../js/airtime/dashboard/helperfunctions.js | 83 +------------------ 5 files changed, 32 insertions(+), 90 deletions(-) diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 1e3037fa6..a473e4628 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -84,10 +84,11 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/playlist.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); $view->headScript()->appendFile($baseUrl.'/js/airtime/dashboard/versiontooltip.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $view->headScript()->appendFile($baseUrl.'/js/airtime/common/common.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); if (Application_Model_Preference::GetPlanLevel() != "disabled" - && $_SERVER['REQUEST_URI'] != '/Dashboard/stream-player') { + && ($_SERVER['REQUEST_URI'] != '/Dashboard/stream-player' || $_SERVER['REQUEST_URI'] != '/Playlist/audio-preview-player')) { $client_id = Application_Model_Preference::GetClientId(); $view->headScript()->appendScript("var livechat_client_id = '$client_id';"); $view->headScript()->appendFile($baseUrl . '/js/airtime/common/livechat.js?'.$CC_CONFIG['airtime_version'], 'text/javascript'); diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index efa4fb8b4..a0911f636 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -15,6 +15,7 @@ class PlaylistController extends Zend_Controller_Action ->addActionContext('new', 'json') ->addActionContext('edit', 'json') ->addActionContext('delete', 'json') + ->addActionContext('play', 'json') ->addActionContext('set-playlist-fades', 'json') ->addActionContext('get-playlist-fades', 'json') ->addActionContext('set-playlist-name', 'json') @@ -111,6 +112,7 @@ class PlaylistController extends Zend_Controller_Action $baseUrl = $request->getBaseUrl(); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/playlist_jplayer_preview.js?'.filemtime($baseDir.'/js/airtime/library/playlist_jplayer_preview.js'), 'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); $this->_helper->viewRenderer->setResponseSegment('spl'); @@ -194,6 +196,31 @@ class PlaylistController extends Zend_Controller_Action $this->playlistUnknownError($e); } } + + public function audioPreviewPlayerAction() + { + Logging::log("PlaylistControler::in the play action"); + + $fileName = $this->_getParam('elementFilename'); + $playlistIndex = $this->_getParam('elemIndexString'); + + $request = $this->getRequest(); + $baseUrl = $request->getBaseUrl(); + $baseDir = dirname($_SERVER['SCRIPT_FILENAME']); + + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/playlist_jplayer_preview.js?'.filemtime($baseDir.'/js/airtime/library/playlist_jplayer_preview.js'),'text/javascript'); + $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.blue.monday.css?'.filemtime($baseDir.'/js/jplayer/skin/jplayer.blue.monday.css')); + $this->_helper->layout->setLayout('bare'); + + $logo = Application_Model_Preference::GetStationLogo(); + if($logo){ + $this->view->logo = "data:image/png;base64,$logo"; + } else { + $this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png"; + } + $this->view->fileName = $fileName; + $this->view->playlistIndex= $playlistIndex; + } public function addItemsAction() { diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index aee765c85..83a0bf068 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -629,9 +629,7 @@ class Application_Model_StoredFile { $results = Application_Model_StoredFile::searchFiles($displayColumns, $fromTable, $datatables); - foreach ($results['aaData'] as &$row) { - $row['id'] = intval($row['id']); $formatter = new LengthFormatter($row['length']); diff --git a/airtime_mvc/application/views/scripts/playlist/update.phtml b/airtime_mvc/application/views/scripts/playlist/update.phtml index 3159530f3..35efc766c 100644 --- a/airtime_mvc/application/views/scripts/playlist/update.phtml +++ b/airtime_mvc/application/views/scripts/playlist/update.phtml @@ -1,15 +1,12 @@ pl->getContents(); if (count($items)) : ?> -
  • " unqid="">
    - ', '');"> + ', '');">
    diff --git a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js index f4516ea2c..12b419d96 100644 --- a/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js +++ b/airtime_mvc/public/js/airtime/dashboard/helperfunctions.js @@ -186,88 +186,7 @@ function audioStream(){ swfPath: "/js/jplayer", supplied: supplied }); -} - -function playlistAudioPreviewEditor(filename, elemIndexString){ - - elemIndex =parseInt(elemIndexString)+1;//increment the index as tags start from 1 not 0 - console.log("hello world with index "+elemIndex); - - - var cueIn = $("dd[id^=spl_cue_in_"+elemIndex+"]").find('span').html(); - console.log(cueIn); - - var cueOut = $("dd[id^=spl_cue_out_"+elemIndex+"]").find('span').html(); - console.log("The cueOut is "+cueOut); - - var fadeIn = $("dd[id^=spl_fade_in_"+elemIndex+"]").find('span').html(); - if (fadeIn == undefined){ console.log("undefined fadein"); fadeIn = $("dd[id^=spl_fade_in_main]").find('span').html();} - console.log("The fadeIn is "+fadeIn); - - var fadeInFileName = ""; - if (fadeIn != undefined && parseInt(fadeIn) > 0 ){ - //need to get the previous element in the playlist...but don't support previous playlist fading becuase thats not possible. - - } - console.log("The fadeInFileName is "+fadeInFileName); - - var fadeOut = $("dd[id^=spl_fade_out_"+elemIndex+"]").find('span').html(); - if (fadeOut == undefined){ console.log("undefined fadeout"); fadeOut = $("dd[id^=spl_fade_out_main]").find('span').html();} - console.log("The fadeOut is "+fadeOut); - - var fadeOutFileName = ""; - if (fadeOut != undefined && parseInt(fadeOut) > 0 ){ - //need to get the next element in the playlist...but don't support next playlist fading becuase thats not possible. - - } - console.log("The fadeOutFileName is "+fadeOutFileName); - - //Pop out a play list with cue in and cue out set. - console.log(baseUrl+"Dashboard/audio-preview-player"); - //window.open(baseUrl+"Dashboard/audio-preview-player", "music player", "width=200,height=200"); - event.preventDefault(); - - //Set the play button to pause. - var elemID = "spl_"+elemIndexString; - $('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause"); - -} - -function audioPreview(filename, elemID){ - - var elems = $('.ui-icon.ui-icon-pause'); - elems.attr("class", "ui-icon ui-icon-play"); - - if ($("#jquery_jplayer_1").data("jPlayer") && $("#jquery_jplayer_1").data("jPlayer").status.paused != true){ - $('#jquery_jplayer_1').jPlayer('stop'); - return; - } - - var ext = getFileExt(filename); - var uri = "/api/get-media/file/" + filename; - - var media; - var supplied; - if (ext == "ogg"){ - media = {oga:uri}; - supplied = "oga"; - } else { - media = {mp3:uri}; - supplied = "mp3"; - } - - $("#jquery_jplayer_1").jPlayer("destroy"); - $("#jquery_jplayer_1").jPlayer({ - ready: function () { - $(this).jPlayer("setMedia", media).jPlayer("play"); - }, - swfPath: "/js/jplayer", - supplied: supplied, - wmode:"window" - }); - - $('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause"); -} +} function resizeImg(ele, targetWidth, targetHeight){ var img = $(ele); From b8452928da9b456111ce6476a8eb112cd12292f9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Fri, 24 Feb 2012 18:24:24 -0500 Subject: [PATCH 06/12] CC-2430: Preview tracks in the library + better preview (ability to jump around in clip) - updated player ui so it matches demo code - can play any song from the library or playlist builder, but not very usable --- .../controllers/PlaylistController.php | 32 +- airtime_mvc/application/models/StoredFile.php | 5 +- .../playlist/audio-preview-player.phtml | 33 + .../js/jplayer/skin/jplayer.blue.monday.css | 624 +++++++++++++++++- 4 files changed, 677 insertions(+), 17 deletions(-) create mode 100644 airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml diff --git a/airtime_mvc/application/controllers/PlaylistController.php b/airtime_mvc/application/controllers/PlaylistController.php index a0911f636..b68a280ff 100644 --- a/airtime_mvc/application/controllers/PlaylistController.php +++ b/airtime_mvc/application/controllers/PlaylistController.php @@ -15,7 +15,7 @@ class PlaylistController extends Zend_Controller_Action ->addActionContext('new', 'json') ->addActionContext('edit', 'json') ->addActionContext('delete', 'json') - ->addActionContext('play', 'json') + ->addActionContext('play', 'json') ->addActionContext('set-playlist-fades', 'json') ->addActionContext('get-playlist-fades', 'json') ->addActionContext('set-playlist-name', 'json') @@ -112,10 +112,10 @@ class PlaylistController extends Zend_Controller_Action $baseUrl = $request->getBaseUrl(); $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/spl.js?'.$CC_CONFIG['airtime_version'],'text/javascript'); - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/playlist_jplayer_preview.js?'.filemtime($baseDir.'/js/airtime/library/playlist_jplayer_preview.js'), 'text/javascript'); - $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/preview.js?'.filemtime($baseDir.'/js/airtime/library/preview.js'), 'text/javascript'); + $this->view->headLink()->appendStylesheet($baseUrl.'/css/playlist_builder.css?'.$CC_CONFIG['airtime_version']); - $this->_helper->viewRenderer->setResponseSegment('spl'); + $this->_helper->viewRenderer->setResponseSegment('spl'); try { if (isset($this->pl_sess->id)) { @@ -199,18 +199,20 @@ class PlaylistController extends Zend_Controller_Action public function audioPreviewPlayerAction() { - Logging::log("PlaylistControler::in the play action"); - - $fileName = $this->_getParam('elementFilename'); - $playlistIndex = $this->_getParam('elemIndexString'); - - $request = $this->getRequest(); + Logging::log("PlaylistControler::in the play action"); + + $fileName = $this->_getParam('filename'); + $playlistIndex = $this->_getParam('index'); + + $request = $this->getRequest(); $baseUrl = $request->getBaseUrl(); $baseDir = dirname($_SERVER['SCRIPT_FILENAME']); - - $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/playlist_jplayer_preview.js?'.filemtime($baseDir.'/js/airtime/library/playlist_jplayer_preview.js'),'text/javascript'); + + $this->view->headScript()->appendFile($baseUrl.'/js/airtime/library/preview_jplayer.js?'.filemtime($baseDir.'/js/airtime/library/preview_jplayer.js'),'text/javascript'); + $this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.min.js?'.filemtime($baseDir.'/js/jplayer/jquery.jplayer.min.js'),'text/javascript'); + //$this->view->headScript()->appendFile($baseUrl.'/js/jplayer/jquery.jplayer.inspector.js?'.filemtime($baseDir.'/js/jplayer/jquery.jplayer.inspector.js'),'text/javascript'); $this->view->headLink()->appendStylesheet($baseUrl.'/js/jplayer/skin/jplayer.blue.monday.css?'.filemtime($baseDir.'/js/jplayer/skin/jplayer.blue.monday.css')); - $this->_helper->layout->setLayout('bare'); + $this->_helper->layout->setLayout('audioPlayer'); $logo = Application_Model_Preference::GetStationLogo(); if($logo){ @@ -218,8 +220,8 @@ class PlaylistController extends Zend_Controller_Action } else { $this->view->logo = "$baseUrl/css/images/airtime_logo_jp.png"; } - $this->view->fileName = $fileName; - $this->view->playlistIndex= $playlistIndex; + $this->view->fileName = $fileName; + $this->view->playlistIndex= $playlistIndex; } public function addItemsAction() diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 83a0bf068..fe9515ed2 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -395,6 +395,7 @@ class Application_Model_StoredFile { } private function constructGetFileUrl($p_serverName, $p_serverPort){ +Logging::log("getting media! - 2"); return "http://$p_serverName:$p_serverPort/api/get-media/file/".$this->getGunId().".".$this->getFileExtension(); } @@ -404,6 +405,7 @@ class Application_Model_StoredFile { */ public function getRelativeFileUrl($baseUrl) { + Logging::log("getting media!"); return $baseUrl."/api/get-media/file/".$this->getGunId().".".$this->getFileExtension(); } @@ -656,7 +658,8 @@ class Application_Model_StoredFile { if($type == "au") { $audioFile = $audioResults[$row['id']-1]['gunid'].".".pathinfo($audioResults[$row['id']-1]['filepath'], PATHINFO_EXTENSION); - $row['image'] = ''; + $row['image'] = ''; + } else { $row['image'] = ''; diff --git a/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml b/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml new file mode 100644 index 000000000..ab33c2eca --- /dev/null +++ b/airtime_mvc/application/views/scripts/playlist/audio-preview-player.phtml @@ -0,0 +1,33 @@ +
  • " unqid="">
    - ', '');"> - - +
    "> + +
    diff --git a/airtime_mvc/public/css/playlist_builder.css b/airtime_mvc/public/css/playlist_builder.css index cef0a7eba..931bc8ff0 100644 --- a/airtime_mvc/public/css/playlist_builder.css +++ b/airtime_mvc/public/css/playlist_builder.css @@ -143,7 +143,7 @@ #side_playlist h3 + h4 { margin:0 0 11px 0; } -#spl_sortable a.big_play { +#spl_sortable div.big_play { display:block; width:20px; height:50px; @@ -155,21 +155,21 @@ background: -moz-linear-gradient(top, #707070 0, #666666 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #707070), color-stop(100%, #666666)); } -#spl_sortable a.big_play:hover { +#spl_sortable div.big_play:hover { border:1px solid #282828; background-color: #3b3b3b; background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%); background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929)); } -#spl_sortable a.big_play .ui-icon-play { +#spl_sortable div.big_play .ui-icon-play { margin: 17px 0 0 1px; } -#spl_sortable a.big_play .ui-icon-pause { +#spl_sortable div.big_play .ui-icon-pause { margin: 17px 0 0 1px; } -#spl_sortable a.big_play:hover .ui-icon-play, #spl_sortable a.big_play:hover .ui-icon-pause { +#spl_sortable div.big_play:hover .ui-icon-play, #spl_sortable div.big_play:hover .ui-icon-pause { background-image:url(redmond/images/ui-icons_ff5d1a_256x240.png); } #spl_sortable .ui-icon-closethick { diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index 9037c7ceb..bc895b20b 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -160,7 +160,7 @@ //add the play function to the library_type td $(nRow).find('td.library_type').click(function(){ - open_audio_preview(aData.audioFile, iDataIndex); + open_audio_preview(aData.track_title, aData.audioFile, aData.id); return false; }); @@ -360,7 +360,7 @@ //define a play callback. if (oItems.play !== undefined) { callback = function() { - open_audio_preview(data.audioFile, data.id); + open_audio_preview(data.track_title, data.audioFile, data.id); }; oItems.play.callback = callback; } @@ -638,13 +638,13 @@ var audio_preview_window = null; - function open_audio_preview(filename, index) { - url = 'Playlist/audio-preview-player/filename/'+filename+'/index/'+index; + function open_audio_preview(name, filename, index) { + url = 'Playlist/audio-preview-player/name/'+name+'/filename/'+filename+'/index/'+index; //$.post(baseUri+'Playlist/audio-preview-player', {fileName: fileName, cueIn: cueIn, cueOut: cueOut, fadeIn: fadeIn, fadeInFileName: fadeInFileName, fadeOut: fadeOut, fadeOutFileName: fadeOutFileName}) if (audio_preview_window == null || audio_preview_window.closed){ audio_preview_window = window.open(url, 'Audio Player', 'width=400,height=95'); } else if (!audio_preview_window.closed) { - audio_preview_window.play(filename); + audio_preview_window.play(name, filename); } else { console.log("something else : "+baseUrl+url); } diff --git a/airtime_mvc/public/js/airtime/library/preview.js b/airtime_mvc/public/js/airtime/library/preview.js deleted file mode 100644 index 13e4b39e5..000000000 --- a/airtime_mvc/public/js/airtime/library/preview.js +++ /dev/null @@ -1,69 +0,0 @@ -var audio_preview_window_p = null; - -function playlistAudioPreviewEditor(filename, elemIndexString){ - - elemIndex =parseInt(elemIndexString)+1;//increment the index as tags start from 1 not 0 - - var cueIn = $("dd[id^=spl_cue_in_"+elemIndex+"]").find('span').html(); - console.log(cueIn); - - var cueOut = $("dd[id^=spl_cue_out_"+elemIndex+"]").find('span').html(); - console.log("The cueOut is "+cueOut); - - var fadeIn = $("dd[id^=spl_fade_in_"+elemIndex+"]").find('span').html(); - if (fadeIn == undefined){ console.log("undefined fadein"); fadeIn = $("dd[id^=spl_fade_in_main]").find('span').html();} - console.log("The fadeIn is "+fadeIn); - - var fadeInFileName = ""; - if (fadeIn != undefined && parseInt(fadeIn) > 0 ){ - //need to get the previous element in the playlist...but don't support previous playlist fading becuase thats not possible. - - } - console.log("The fadeInFileName is "+fadeInFileName); - - var fadeOut = $("dd[id^=spl_fade_out_"+elemIndex+"]").find('span').html(); - if (fadeOut == undefined){ console.log("undefined fadeout"); fadeOut = $("dd[id^=spl_fade_out_main]").find('span').html();} - console.log("The fadeOut is "+fadeOut); - - var fadeOutFileName = ""; - if (fadeOut != undefined && parseInt(fadeOut) > 0 ){ - //need to get the next element in the playlist...but don't support next playlist fading becuase thats not possible. - - } - console.log("The fadeOutFileName is "+fadeOutFileName); - - //Pop out a play list with cue in and cue out set. - open_player(); - - //Set the play button to pause. - var elemID = "spl_"+elemIndexString; - $('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause"); - -} - -function open_audio_preview_old(filename, index) { - console.log("hello world 2 "+filename+" help?"); - url = 'Playlist/audio-preview-player/filename/'+filename+'/index/'+index; - //$.post(baseUri+'Playlist/audio-preview-player', {fileName: fileName, cueIn: cueIn, cueOut: cueOut, fadeIn: fadeIn, fadeInFileName: fadeInFileName, fadeOut: fadeOut, fadeOutFileName: fadeOutFileName}) - if (audio_preview_window == null || audio_preview_window.closed){ - console.log("opening : "+baseUrl+url); - - audio_preview_window = window.open(url, 'Audio Player', 'width=400,height=95'); - - } else if (!audio_preview_window.closed) { - console.log("refreshing : "+baseUrl+url); - audio_preview_window.play(filename); - } else { - console.log("something else : "+baseUrl+url); - } - - //Set the play button to pause. - var elemID = "spl_"+elemIndexString; - $('#'+elemID+' div.list-item-container a span').attr("class", "ui-icon ui-icon-pause"); - - return false; -} - -$('#library_type').bind('click', function(){ - console.log(data); -}); \ No newline at end of file diff --git a/airtime_mvc/public/js/airtime/library/preview_jplayer.js b/airtime_mvc/public/js/airtime/library/preview_jplayer.js index 6835123a6..15c53f9ec 100644 --- a/airtime_mvc/public/js/airtime/library/preview_jplayer.js +++ b/airtime_mvc/public/js/airtime/library/preview_jplayer.js @@ -37,11 +37,12 @@ function audioPreview(filename, elemID){ $(document).ready(function(){ var filename = $(".filename").text(); - play(filename); + var name = $(".name").text(); + play(name, filename); }); -function play(filename){ - var uri = "/api/get-media/file/" + filename; +function play(name, filename){ + var uri = "/api/get-media/name/"+name+"/filename/" + filename; var ext = getFileExt(filename); diff --git a/airtime_mvc/public/js/airtime/library/spl.js b/airtime_mvc/public/js/airtime/library/spl.js index e90aeaa33..dd30cc53d 100644 --- a/airtime_mvc/public/js/airtime/library/spl.js +++ b/airtime_mvc/public/js/airtime/library/spl.js @@ -245,6 +245,16 @@ var AIRTIME = (function(AIRTIME){ } } + function openAudioPreview(event) { + event.stopPropagation(); + + var name = $(this).parent().find('.spl_title').text(); + var audioFile = $(this).attr('audioFile'); + var id = ""; + + open_audio_preview(name, audioFile, id); + } + function editName() { var nameElement = $(this), playlistName = nameElement.text(), @@ -343,6 +353,9 @@ var AIRTIME = (function(AIRTIME){ $(el).delegate(".spl_cue", {"click": openCueEditor}); + //add the play function to the play icon + $(el).delegate(".big_play", + {"click": openAudioPreview}); } //sets events dynamically for the cue editor. diff --git a/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css b/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css index 61daa3a11..ca518c523 100644 --- a/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css +++ b/airtime_mvc/public/js/jplayer/skin/jplayer.audio-preview.blue.monday.css @@ -92,7 +92,9 @@ div.jp-video div.jp-interface { span.filename { display:none; } - +span.name { + display:none; +} /* @group CONTROLS */ div.jp-controls-holder {