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

CC-1799 Put Airtime Storage into a Human Readable File Naming Convention

Browse source 
regression testing with refactored storedfile, having permission problems unlinking a file.
This commit is contained in:
Naomi Aro 2011-06-09 11:50:03 +02:00
parent 1f9a39f22d
commit a4b92fe72d
4 changed files with 45 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
airtime_mvc/application/controllers/ApiController.php
View file

@ -78,7 +78,7 @@ class ApiController extends Zend_Controller_Action
if (ctype_alnum($file_id) && strlen($file_id) == 32) {
$media = StoredFile::RecallByGunid($file_id);
if ($media != null && !PEAR::isError($media)) {
$filepath = $media->getRealFilePath();
$filepath = $media->getFilePath();
if(!is_file($filepath))
{
header($_SERVER["SERVER_PROTOCOL"]." 404 Not Found");
@ -419,7 +419,7 @@ class ApiController extends Zend_Controller_Action
//New file added to Airtime
if (is_null($file)) {
$file = new StoredFile($md);
$file = StoredFile::Insert($md);
}
//Updating a metadata change.
else {

8
airtime_mvc/application/controllers/LibraryController.php
View file

@ -78,7 +78,7 @@ class LibraryController extends Zend_Controller_Action
$file_id = $this->_getParam('id', null);
$file = StoredFile::Recall($file_id);
$url = $file->getFileURL().'/api_key/'.$CC_CONFIG["apiKey"][0].'/download/true';
$url = $file->getFileUrl().'/api_key/'.$CC_CONFIG["apiKey"][0].'/download/true';
$menu[] = array('action' => array('type' => 'gourl', 'url' => $url),
'title' => 'Download');
@ -162,10 +162,10 @@ class LibraryController extends Zend_Controller_Action
if ($form->isValid($request->getPost())) {
$formdata = $form->getValues();
$file->replaceDbMetadata($formdata);
$file->setDbColMetadata($formdata);
$data = $formdata;
$data['filepath'] = $file->getRealFilePath();
$data['filepath'] = $file->getFilePath();
//wait for 1.9.0 release
//RabbitMq::SendFileMetaData($data);
@ -173,7 +173,7 @@ class LibraryController extends Zend_Controller_Action
}
}
$form->populate($file->md);
$form->populate($file->getDbColMetadata());
$this->view->form = $form;
}