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

CC-1434 && CC-1373

Browse source 
Won't delete a file that's scheduled or contained in a playlist.
This commit is contained in:
naomiaro 2010-09-13 14:05:45 -04:00
parent 51436f76b8
commit 4d3b90621e
2 changed files with 87 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/modules/storageServer/var/BasicStor.php
View file

@ -159,23 +159,55 @@ class BasicStor {
$res = BasicStor::RemoveObj($id, $forced);
return $res;
}
$storedFile = StoredFile::Recall($id);
if (is_null($storedFile) || PEAR::isError($storedFile)) {
return $storedFile;
}
if ($storedFile->isAccessed()) {
return PEAR::raiseError(
'Cannot delete an object that is currently accessed.'
);
}
// move to trash:
switch (BasicStor::GetObjType($id)) {
case "audioclip":
$playLists = $storedFile->getPlaylists();
$item_gunid = $storedFile->getGunid();
if( $playLists != NULL) {
foreach($playLists as $key=>$val) {
$playList_id = BasicStor::IdFromGunidBigInt($val["gunid"]);
$playList_titles[] = BasicStor::bsGetMetadataValue($playList_id, "dc:title");
}
return PEAR::raiseError(
'Please remove this song from all playlists: ' . join(",", $playList_titles)
);
}
break;
case "playlist":
if($storedFile->isScheduled()) {
return PEAR::raiseError(
'Cannot delete an object that is scheduled to play.'
);
}
break;
case "webstream":
$storedFile = StoredFile::Recall($id);
if (is_null($storedFile) || PEAR::isError($storedFile)) {
return $storedFile;
}
$res = $storedFile->setState('deleted');
if (PEAR::isError($res)) {
return $res;
}
break;
default:
}
return TRUE;
$res = $storedFile->setState('deleted');
if (PEAR::isError($res)) {
return $res;
}
return TRUE;
}
@ -1491,7 +1523,7 @@ class BasicStor {
/**
* Get local id from global id.
* Get local id from global id (in hex).
*
* @param string $p_gunid
* Global id
@ -1505,6 +1537,21 @@ class BasicStor {
return $CC_DBC->getOne("SELECT id FROM ".$CC_CONFIG['filesTable']." WHERE gunid=x'$p_gunid'::bigint");
}
/**
* Get local id from global id (big int).
*
* @param string $p_gunid
* Global id
* @return int
* Local id
*/
public static function IdFromGunidBigInt($p_gunid)
{
global $CC_DBC;
global $CC_CONFIG;
return $CC_DBC->getOne("SELECT id FROM ".$CC_CONFIG['filesTable']." WHERE gunid='$p_gunid'");
}
/**
* Get global id from local id

29
src/modules/storageServer/var/StoredFile.php
View file

@ -1087,6 +1087,35 @@ class StoredFile {
return TRUE;
}
/**
* Returns gunIds of the playlists the stored file is in.
*/
public function getPlaylists() {
global $CC_CONFIG, $CC_DBC;
$_SESSION['delete'] = "gunid: " . $this->gunid;
$sql = "SELECT gunid "
." FROM ".$CC_CONFIG['mdataTable']
." WHERE object='{$this->gunid}'";
$_SESSION['delete'] = $sql;
$playlists = $CC_DBC->getAll($sql);
return $playlists;
}
public function isScheduled() {
global $CC_CONFIG, $CC_DBC;
$sql = "SELECT * "
." FROM ".$CC_CONFIG['scheduleTable']
." WHERE ends > now() and playlist=x'{$this->gunid}'::bigint";
$scheduled = $CC_DBC->getAll($sql);
return $scheduled;
}
/**
* Returns true if virtual file is currently in use.<br>