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

Minor code formatting tweaks.

This commit is contained in:
paul 2007-01-12 06:13:13 +00:00
parent a11d39d8f6
commit 7aaabb2165
2 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
campcaster/src/modules/storageServer/var/LocStor.php
View File

@ -93,7 +93,7 @@ class LocStor extends BasicStor {
if (PEAR::isError($oid)) { if (PEAR::isError($oid)) {
return $oid; return $oid;
} }
$storedFile =& StoredFile::insert($oid, '', '', $metadata, $storedFile =& StoredFile::Insert($oid, '', '', $metadata,
'string', $gunid, $ftype); 'string', $gunid, $ftype);
if (PEAR::isError($storedFile)) { if (PEAR::isError($storedFile)) {
$res = BasicStor::RemoveObj($oid); $res = BasicStor::RemoveObj($oid);
@ -606,10 +606,9 @@ class LocStor extends BasicStor {
if (PEAR::isError($oid)) { if (PEAR::isError($oid)) {
return $oid; return $oid;
} }
$storedFile =& StoredFile::insert($oid, '', '', $storedFile =& StoredFile::Insert($oid, '', '',
dirname(__FILE__).'/emptyPlaylist.xml', dirname(__FILE__).'/emptyPlaylist.xml',
'file', $playlistId, 'playlist' 'file', $playlistId, 'playlist');
);
if (PEAR::isError($storedFile)) { if (PEAR::isError($storedFile)) {
$res = BasicStor::RemoveObj($oid); $res = BasicStor::RemoveObj($oid);
return $storedFile; return $storedFile;

36
campcaster/src/modules/storageServer/var/StoredFile.php
View File

@ -333,7 +333,7 @@ class StoredFile {
$this->gunid = StoredFile::CreateGunid(); $this->gunid = StoredFile::CreateGunid();
} }
$this->resDir = $this->_getResDir($this->gunid); $this->resDir = $this->_getResDir($this->gunid);
$this->filepath = $this->makeFileName(); $this->filepath = "{$this->resDir}/{$this->gunid}";
$this->exists = is_file($this->filepath) && is_readable($this->filepath); $this->exists = is_file($this->filepath) && is_readable($this->filepath);
$this->md = new MetaData($this->gunid, $this->resDir); $this->md = new MetaData($this->gunid, $this->resDir);
} }
@ -361,14 +361,12 @@ class StoredFile {
* copy the media file if true, make symlink if false * copy the media file if true, make symlink if false
* @return StoredFile * @return StoredFile
*/ */
public static function insert($oid, $filename, $localFilePath='', public static function Insert($oid, $filename, $localFilePath='',
$metadata='', $mdataLoc='file', $gunid=NULL, $ftype=NULL, $copyMedia=TRUE) $metadata='', $mdataLoc='file', $gunid=NULL, $ftype=NULL,
$copyMedia=TRUE)
{ {
global $CC_CONFIG, $CC_DBC; global $CC_CONFIG, $CC_DBC;
$storedFile = new StoredFile(($gunid ? $gunid : NULL)); $storedFile = new StoredFile(($gunid ? $gunid : NULL));
if (PEAR::isError($storedFile)) {
return $storedFile;
}
$storedFile->name = $filename; $storedFile->name = $filename;
$storedFile->id = $oid; $storedFile->id = $oid;
$storedFile->mime = "unknown"; $storedFile->mime = "unknown";
@ -378,7 +376,6 @@ class StoredFile {
} }
$storedFile->exists = FALSE; $storedFile->exists = FALSE;
if (file_exists($localFilePath)) { if (file_exists($localFilePath)) {
$storedFile->exists = TRUE;
$md5 = md5_file($localFilePath); $md5 = md5_file($localFilePath);
} }
$escapedName = pg_escape_string($filename); $escapedName = pg_escape_string($filename);
@ -401,7 +398,7 @@ class StoredFile {
$emptyState = FALSE; $emptyState = FALSE;
} }
if ( ($mdataLoc == 'file') && !file_exists($metadata)) { if ( ($mdataLoc == 'file') && !file_exists($metadata)) {
return PEAR::raiseError("StoredFile::insert: ". return PEAR::raiseError("StoredFile::Insert: ".
"metadata file not found ($metadata)"); "metadata file not found ($metadata)");
} }
$res = $storedFile->md->insert($metadata, $mdataLoc, $ftype); $res = $storedFile->md->insert($metadata, $mdataLoc, $ftype);
@ -412,7 +409,7 @@ class StoredFile {
// --- media file insert: // --- media file insert:
if ($localFilePath != '') { if ($localFilePath != '') {
if (!file_exists($localFilePath)) { if (!file_exists($localFilePath)) {
return PEAR::raiseError("StoredFile::insert: ". return PEAR::raiseError("StoredFile::Insert: ".
"media file not found ($localFilePath)"); "media file not found ($localFilePath)");
} }
$res = $storedFile->addFile($localFilePath, $copyMedia); $res = $storedFile->addFile($localFilePath, $copyMedia);
@ -423,19 +420,11 @@ class StoredFile {
$mime = $storedFile->getMime(); $mime = $storedFile->getMime();
if ($mime !== FALSE) { if ($mime !== FALSE) {
$res = $storedFile->setMime($mime); $res = $storedFile->setMime($mime);
if (PEAR::isError($res)) {
$CC_DBC->query("ROLLBACK");
return $res;
}
} }
$emptyState = FALSE; $emptyState = FALSE;
} }
if (!$emptyState) { if (!$emptyState) {
$res = $storedFile->setState('ready'); $res = $storedFile->setState('ready');
if (PEAR::isError($res)) {
$CC_DBC->query("ROLLBACK");
return $res;
}
} }
$res = $CC_DBC->query("COMMIT"); $res = $CC_DBC->query("COMMIT");
if (PEAR::isError($res)) { if (PEAR::isError($res)) {
@ -676,17 +665,6 @@ class StoredFile {
} }
/**
* Contruct filepath of media file
*
* @return string
*/
public function makeFileName()
{
return "{$this->resDir}/{$this->gunid}";
}
/** /**
* Create instance of StoredFile object and make copy of existing file * Create instance of StoredFile object and make copy of existing file
* *
@ -698,7 +676,7 @@ class StoredFile {
*/ */
public static function CopyOf(&$src, $nid) public static function CopyOf(&$src, $nid)
{ {
$storedFile = StoredFile::insert($nid, $src->name, $src->getRealFileName(), $storedFile = StoredFile::Insert($nid, $src->name, $src->getRealFileName(),
'', '', NULL, BasicStor::GetType($src->gunid)); '', '', NULL, BasicStor::GetType($src->gunid));
if (PEAR::isError($storedFile)) { if (PEAR::isError($storedFile)) {
return $storedFile; return $storedFile;