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

Merge branch 'cc-5709-airtime-analyzer' into cc-5709-airtime-analyzer-saas

This commit is contained in:
drigato 2014-04-29 10:35:58 -04:00
parent 6adb7c53ae 94375ee441
commit f0fdf85524
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
airtime_mvc/application/modules/rest/controllers/MediaController.php
View File

@ -146,20 +146,8 @@ class Rest_MediaController extends Zend_Rest_Controller
$basePath = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/organize/" : "/srv/airtime/stor/organize/"; $basePath = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/organize/" : "/srv/airtime/stor/organize/";
//$relativePath is the folder name(if one) + track name, that was uploaded via ftp //$relativePath is the folder name(if one) + track name, that was uploaded via ftp
$relativePath = substr($fullPath, strlen($basePath)-1); $relativePath = substr($fullPath, strlen($basePath)-1);
//after the file is moved from organize, store it's parent folder so we can delete it after
if (dirname($relativePath) != '/') {
$pathToDelete = Application_Common_OsPath::join(
$basePath,
dirname($relativePath)
);
} else {
//if the uploaded file was not in a folder, DO NOT delete
$pathToDelete = false;
}
} else { } else {
$relativePath = $_FILES["file"]["name"]; $relativePath = $_FILES["file"]["name"];
$pathToDelete = false;
} }
@ -175,12 +163,6 @@ class Rest_MediaController extends Zend_Rest_Controller
$this->processUploadedFile($callbackUrl, $relativePath, $this->getOwnerId()); $this->processUploadedFile($callbackUrl, $relativePath, $this->getOwnerId());
if ($pathToDelete) {
Logging::info($pathToDelete);
//delete the empty folder that was uploaded via ftp (if one)
rmdir($pathToDelete);
}
$this->getResponse() $this->getResponse()
->setHttpResponseCode(201) ->setHttpResponseCode(201)
->appendBody(json_encode($this->sanitizeResponse($file))); ->appendBody(json_encode($this->sanitizeResponse($file)));
@ -233,6 +215,10 @@ class Rest_MediaController extends Zend_Rest_Controller
$now = new DateTime("now", new DateTimeZone("UTC")); $now = new DateTime("now", new DateTimeZone("UTC"));
$file->setDbMtime($now); $file->setDbMtime($now);
$file->save(); $file->save();
$this->removeEmptySubFolders(
isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."/srv/airtime/stor/organize/" : "/srv/airtime/stor/organize/");
$this->getResponse() $this->getResponse()
->setHttpResponseCode(200) ->setHttpResponseCode(200)
->appendBody(json_encode($this->sanitizeResponse($file))); ->appendBody(json_encode($this->sanitizeResponse($file)));
@ -459,5 +445,10 @@ class Rest_MediaController extends Zend_Rest_Controller
return $response; return $response;
} }
private function removeEmptySubFolders($path)
{
exec("find $path -empty -type d -delete");
}
} }