Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

playlists appear in scratchpad, can close, reopen for edit.

This commit is contained in:
naomiaro 2010-09-22 10:43:23 -04:00
parent 6d9e5028fc
commit 04e81df67c
4 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/htmlUI/var/html/ui_handler.php
View File

@ -295,7 +295,7 @@ switch ($_REQUEST['act']) {
case "PL.activate": case "PL.activate":
if ($uiHandler->PLAYLIST->activate($_REQUEST['id']) === TRUE) { if ($uiHandler->PLAYLIST->activate($_REQUEST['id']) === TRUE) {
$uiHandler->SCRATCHPAD->addItem($_REQUEST['id']); $uiHandler->SCRATCHPAD->addItem($_REQUEST['id'], TRUE);
} }
$uiHandler->PLAYLIST->setRedirect(); $uiHandler->PLAYLIST->setRedirect();
break; break;
@ -306,7 +306,7 @@ switch ($_REQUEST['act']) {
if ($ids) { if ($ids) {
//$uiHandler->SCRATCHPAD->addItem($ids); //$uiHandler->SCRATCHPAD->addItem($ids);
} }
//$uiHandler->SCRATCHPAD->addItem($ui_tmpid); $uiHandler->SCRATCHPAD->addItem($ui_tmpid, TRUE);
} }
$uiHandler->PLAYLIST->setRedirect('_2PL.editMetaData'); $uiHandler->PLAYLIST->setRedirect('_2PL.editMetaData');
break; break;

30
src/modules/htmlUI/var/ui_base.inc.php
View File

@ -527,27 +527,21 @@ class uiBase
} // fn _retMsg } // fn _retMsg
public function getPLMetaInfo($id)
{
$data = array('id' => $id,
'title' => $this->gb->getPLMetadataValue($id, UI_MDATA_KEY_TITLE),
'creator' => $this->gb->getPLMetadataValue($id, UI_MDATA_KEY_CREATOR),
'duration' => $this->gb->getPLMetadataValue($id, UI_MDATA_KEY_DURATION),
'type' => 'playlist',
);
return ($data);
}
public function getMetaInfo($id) public function getMetaInfo($id)
{ {
$type = strtolower(GreenBox::getFileType($id)); $type = strtolower(GreenBox::getFileType($id));
if($type == 'playlist') {
require_once("../../../storageServer/var/Playlist.php");
$playList = new Playlist(GreenBox::GunidFromId($id));
$playListData = $playList->export();
for ($i = 1; $i < count($playListData); $i++) {
$entry = StoredFile::RecallByGunid($playListData["".$i]["gunid"]);
$playListEntries[] = $entry->getName();
}
$_SESSION['mdata'] = $playListEntries;
}
$data = array('id' => $id, $data = array('id' => $id,
'gunid' => BasicStor::GunidFromId($id), 'gunid' => BasicStor::GunidFromId($id),
'title' => $this->getMetadataValue($id, UI_MDATA_KEY_TITLE), 'title' => $this->getMetadataValue($id, UI_MDATA_KEY_TITLE),
@ -557,8 +551,6 @@ class uiBase
'source' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_SOURCE) : NULL, 'source' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_SOURCE) : NULL,
'bitRate' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_BITRATE) : NULL, 'bitRate' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_BITRATE) : NULL,
'sampleRate' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_SAMPLERATE) : NULL, 'sampleRate' => $type == 'audioclip' ? $this->getMetadataValue($id, UI_MDATA_KEY_SAMPLERATE) : NULL,
//'isAvailable' => $type == 'playlist' ? $this->gb->playlistIsAvailable($id, $this->sessid) : NULL,
'content' => $type == 'playlist' ? join("/", $playListEntries) : NULL,
); );
return ($data); return ($data);
} // fn getMetaInfo } // fn getMetaInfo

10
src/modules/htmlUI/var/ui_playlist.class.php
View File

@ -224,6 +224,9 @@ class uiPlaylist
return FALSE; return FALSE;
} }
} }
$this->Base->SCRATCHPAD->reloadMetadata();
return TRUE; return TRUE;
} // fn addItem } // fn addItem
@ -249,6 +252,9 @@ class uiPlaylist
return FALSE; return FALSE;
} }
} }
$this->Base->SCRATCHPAD->reloadMetadata();
return TRUE; return TRUE;
} // fn removeItem } // fn removeItem
@ -656,7 +662,9 @@ class uiPlaylist
} }
if (UI_VERBOSE) { if (UI_VERBOSE) {
$this->Base->_retMsg('Metadata saved.'); $this->Base->_retMsg('Metadata saved.');
} }
$this->Base->SCRATCHPAD->reloadMetadata();
} // fn editMetadata } // fn editMetadata

13
src/modules/htmlUI/var/ui_scratchpad.class.php
View File

@ -113,7 +113,7 @@ class uiScratchPad
* One or more media IDs. * One or more media IDs.
* @return boolean * @return boolean
*/ */
public function addItem($ids) public function addItem($ids, $playlist=FALSE)
{ {
if (!$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]) { if (!$this->Base->STATIONPREFS[UI_SCRATCHPAD_MAXLENGTH_KEY]) {
if (UI_WARNING) { if (UI_WARNING) {
@ -133,7 +133,10 @@ class uiScratchPad
$scratchpad = $this->get(); $scratchpad = $this->get();
foreach ($ids as $id) { foreach ($ids as $id) {
$item = $this->Base->getMetaInfo($id); if($playlist === FALSE)
$item = $this->Base->getMetaInfo($id);
else
$item = $this->Base->getPLMetaInfo($id);
foreach ($scratchpad as $key => $val) { foreach ($scratchpad as $key => $val) {
if ($val['id'] == $item['id']) { if ($val['id'] == $item['id']) {
@ -238,8 +241,12 @@ class uiScratchPad
*/ */
public function reloadMetadata() public function reloadMetadata()
{ {
$_SESSION['pl'] = $this->items;
foreach ($this->items as $key => $val) { foreach ($this->items as $key => $val) {
$this->items[$key] = $this->Base->getMetaInfo($val['id']); if($val['type'] === 'playlist')
$this->items[$key] = $this->Base->getPLMetaInfo($val['id']);
else
$this->items[$key] = $this->Base->getMetaInfo($val['id']);
} }
} }
} // class uiScratchPad } // class uiScratchPad