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

#1604 some exceptions catching added

Browse source
This commit is contained in:
tomash 2006-03-22 15:20:27 +00:00
parent 3a939c1e0f
commit d381976633
1 changed files with 28 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

8
livesupport/src/modules/storageServer/var/BasicStor.php
View file

@ -982,6 +982,7 @@ class BasicStor extends Alib{
$res = `cd $tmpd; tar xf $fname`; $res = `cd $tmpd; tar xf $fname`;
// clips: // clips:
$d = dir($tmpdc); $entries=array(); $gunids=array(); $d = dir($tmpdc); $entries=array(); $gunids=array();
if($d !== false){
while (false !== ($entry = $d->read())) { while (false !== ($entry = $d->read())) {
if(preg_match("|^([0-9a-fA-F]{16})\.(.*)$|", $entry, $va)){ if(preg_match("|^([0-9a-fA-F]{16})\.(.*)$|", $entry, $va)){
list(,$gunid, $ext) = $va; list(,$gunid, $ext) = $va;
@ -998,6 +999,7 @@ class BasicStor extends Alib{
} }
} }
$d->close(); $d->close();
}
$res = TRUE; $res = TRUE;
foreach($entries as $gunid=>$it){ foreach($entries as $gunid=>$it){
$rawMedia = "$tmpdc/{$it['rawMedia']}"; $rawMedia = "$tmpdc/{$it['rawMedia']}";
@ -1014,6 +1016,7 @@ class BasicStor extends Alib{
// playlists: // playlists:
require_once"Playlist.php"; require_once"Playlist.php";
$d = dir($tmpdp); $d = dir($tmpdp);
if($d !== false){
while ((!PEAR::isError($res)) && false !== ($entry = $d->read())) { while ((!PEAR::isError($res)) && false !== ($entry = $d->read())) {
if(preg_match("|^([0-9a-fA-F]{16})\.(.*)$|", $entry, $va)){ if(preg_match("|^([0-9a-fA-F]{16})\.(.*)$|", $entry, $va)){
list(,$gunid, $ext) = $va; list(,$gunid, $ext) = $va;
@ -1024,9 +1027,10 @@ class BasicStor extends Alib{
} }
} }
$d->close(); $d->close();
}
//@rmdir($tmpdc); @rmdir($tmpdp); @rmdir($tmpd); //@rmdir($tmpdc); @rmdir($tmpdp); @rmdir($tmpd);
system("rm -rf $tmpdc"); system("rm -rf $tmpdp"); system("rm -rf $tmpd"); @system("rm -rf $tmpdc"); @system("rm -rf $tmpdp"); @system("rm -rf $tmpd");
unlink($tmpn); @unlink($tmpn);
return $res; return $res;
} }