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

cc-4105: Tweaked php method to have more consistent return values

This commit is contained in:
Rudi Grinberg 2012-07-17 11:20:58 -04:00
parent 4ddc5a1f84
commit 166e2cfc2d
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
airtime_mvc/application/controllers/ApiController.php
View File

@ -443,8 +443,17 @@ class ApiController extends Zend_Controller_Action
$this->view->watched_dirs = $watchedDirsPath; $this->view->watched_dirs = $watchedDirsPath;
} }
public function dispatchMetaDataAction($md, $mode) public function dispatchMetaDataAction($md, $mode, $dryrun=false)
{ {
// Replace this compound result in a hash with proper error handling later on
$return_hash = array();
if ( $dry_run ) { // for debugging we return garbage not to screw around with the db
return array(
'md' => $md,
'mode' => $mode,
'fileid' => 123456
);
}
Application_Model_Preference::SetImportTimestamp(); Application_Model_Preference::SetImportTimestamp();
if ($mode == "create") { if ($mode == "create") {
$filepath = $md['MDATA_KEY_FILEPATH']; $filepath = $md['MDATA_KEY_FILEPATH'];
@ -456,8 +465,8 @@ class ApiController extends Zend_Controller_Action
// path already exist // path already exist
if ($file->getFileExistsFlag()) { if ($file->getFileExistsFlag()) {
// file marked as exists // file marked as exists
# TODO : jsonify all the error messages mang $return_hash['error'] = "File already exists in Airtime.";
return "File already exists in Airtime."; return $return_hash;
} else { } else {
// file marked as not exists // file marked as not exists
$file->setFileExistsFlag(true); $file->setFileExistsFlag(true);
@ -471,7 +480,8 @@ class ApiController extends Zend_Controller_Action
//File is not in database anymore. //File is not in database anymore.
if (is_null($file)) { if (is_null($file)) {
return "File does not exist in Airtime."; $return_hash['error'] = "File does not exist in Airtime.";
return $return_hash;
} }
//Updating a metadata change. //Updating a metadata change.
else { else {
@ -497,7 +507,8 @@ class ApiController extends Zend_Controller_Action
$file = Application_Model_StoredFile::RecallByFilepath($filepath); $file = Application_Model_StoredFile::RecallByFilepath($filepath);
if (is_null($file)) { if (is_null($file)) {
return "File doesn't exist in Airtime."; $return_hash['error'] = "File doesn't exist in Airtime.";
return $return_hash;
} }
else { else {
$file->deleteByMediaMonitor(); $file->deleteByMediaMonitor();
@ -511,9 +522,11 @@ class ApiController extends Zend_Controller_Action
foreach($files as $file){ foreach($files as $file){
$file->deleteByMediaMonitor(); $file->deleteByMediaMonitor();
} }
return; $return_hash['success'] = 1;
return $return_hash;
} }
return $file->getId(); $return_hash['fileid'] = $file->getId();
return $return_hash;
} }
public function reloadMetadataGroupAction() public function reloadMetadataGroupAction()
@ -530,7 +543,7 @@ class ApiController extends Zend_Controller_Action
unset( $info_json['mode'] ); unset( $info_json['mode'] );
// TODO : uncomment the following line to actually do something // TODO : uncomment the following line to actually do something
$response = $this->dispatchMetaDataAction($info_json, $info_json['mode']); $response = $this->dispatchMetaDataAction($info_json, $info_json['mode']);
array_push($responses, $this->dispatchMetaDataAction($info_json, $info_json['mode'])); array_push($responses, $response);
// Like wise, remove the following line when done // Like wise, remove the following line when done
// On recorded show requests we do some extra work here. Not sure what it actually is and it // On recorded show requests we do some extra work here. Not sure what it actually is and it
// was usually called from the python api // was usually called from the python api

2
python_apps/pypo/recorder.py
View File

@ -42,7 +42,7 @@ def getDateTimeObj(time):
# - perhaps validate the input before doing dangerous casts? # - perhaps validate the input before doing dangerous casts?
# - rename this function to follow the standard convention # - rename this function to follow the standard convention
# - rename time to something else so that the module name does not get # - rename time to something else so that the module name does not get
# shadowed # shadowed
# - add docstring to document all behaviour of this function # - add docstring to document all behaviour of this function
timeinfo = time.split(" ") timeinfo = time.split(" ")
date = [ int(x) for x in timeinfo[0].split("-") ] date = [ int(x) for x in timeinfo[0].split("-") ]