diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index 37888c9ed..0c1911d55 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -28,6 +28,10 @@ require_once "SecurityHelper.php"; require_once "GoogleAnalytics.php"; require_once "Timezone.php"; require_once "Auth.php"; +require_once "interface/OAuth2.php"; +require_once "TaskManager.php"; +require_once __DIR__.'/services/CeleryService.php'; +require_once __DIR__.'/services/SoundcloudService.php'; require_once __DIR__.'/forms/helpers/ValidationTypes.php'; require_once __DIR__.'/forms/helpers/CustomDecorators.php'; require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php'; @@ -123,11 +127,12 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $view->headScript()->appendScript("var COMPANY_NAME = '" . COMPANY_NAME . "';"); } - protected function _initUpgrade() { + protected function _initTasks() { /* We need to wrap this here so that we aren't checking when we're running the unit test suite */ if (getenv("AIRTIME_UNIT_TEST") != 1) { - UpgradeManager::checkIfUpgradeIsNeeded(); //This will do the upgrade too if it's needed... + //This will do the upgrade too if it's needed... + TaskManager::getInstance()->runTasks(); } } @@ -139,7 +144,9 @@ class Bootstrap extends Zend_Application_Bootstrap_Bootstrap $baseUrl = Application_Common_OsPath::getBaseDir(); - $view->headLink(array('rel' => 'icon', 'href' => $baseUrl . 'favicon.ico', 'type' => 'image/x-icon'), 'PREPEND') + $view->headLink(array('rel' => 'icon', + 'href' => $baseUrl . 'favicon.ico?' . $CC_CONFIG['airtime_version'], + 'type' => 'image/x-icon'), 'PREPEND') ->appendStylesheet($baseUrl . 'css/bootstrap.css?' . $CC_CONFIG['airtime_version']) ->appendStylesheet($baseUrl . 'css/redmond/jquery-ui-1.8.8.custom.css?' . $CC_CONFIG['airtime_version']) ->appendStylesheet($baseUrl . 'css/pro_dropdown_3.css?' . $CC_CONFIG['airtime_version']) diff --git a/airtime_mvc/application/common/TaskManager.php b/airtime_mvc/application/common/TaskManager.php new file mode 100644 index 000000000..aa250f294 --- /dev/null +++ b/airtime_mvc/application/common/TaskManager.php @@ -0,0 +1,232 @@ +_isUserSessionRequest()) { + return; + } + $this->_con = Propel::getConnection(CcPrefPeer::DATABASE_NAME); + $this->_con->beginTransaction(); + try { + $lock = $this->_getLock(); + if ($lock && microtime(true) < $lock['valstr'] + self::TASK_INTERVAL_SECONDS) { + // Propel caches the database connection and uses it persistently, so if we don't + // use commit() here, we end up blocking other queries made within this request + $this->_con->commit(); + return; + } + $this->_updateLock($lock); + $this->_con->commit(); + } catch (Exception $e) { + // We get here if there are simultaneous requests trying to fetch the lock row + $this->_con->rollBack(); + // Logging::info($e->getMessage()); // We actually get here a lot, so it's + // better to be silent here to avoid log bloat + return; + } + foreach ($this->_taskList as $task) { + $task = TaskFactory::getTask($task); + if ($task && $task->shouldBeRun()) { + $task->run(); + } + } + } + + /** + * Check if the current session is a user request + * + * @return bool true if there is a Zend_Auth object in the current session, + * otherwise false + */ + private function _isUserSessionRequest() { + $auth = Zend_Auth::getInstance(); + $data = $auth->getStorage()->read(); + return !empty($data); + } + + /** + * Get the task_manager_lock from cc_pref with a row-level lock for atomicity + * + * The lock is exclusive (prevent reads) and will only last for the duration + * of the transaction. We add NOWAIT so reads on the row during the transaction + * won't block + * + * @return array|bool an array containing the row values, or false on failure + */ + private function _getLock() { + $sql = "SELECT * FROM cc_pref WHERE keystr='task_manager_lock' LIMIT 1 FOR UPDATE NOWAIT"; + $st = $this->_con->prepare($sql); + $st->execute(); + return $st->fetch(); + } + + /** + * Update and commit the new lock value, or insert it if it doesn't exist + * + * @param $lock array cc_pref lock row values + */ + private function _updateLock($lock) { + $sql = empty($lock) ? "INSERT INTO cc_pref (keystr, valstr) VALUES ('task_manager_lock', :value)" + : "UPDATE cc_pref SET valstr=:value WHERE keystr='task_manager_lock'"; + $st = $this->_con->prepare($sql); + $st->execute(array(":value" => microtime(true))); + } + +} + +/** + * Interface AirtimeTask Interface for task operations - also acts as task type ENUM + */ +interface AirtimeTask { + + /** + * PHP doesn't have ENUMs so declare them as interface constants + * Task types - values don't really matter as long as they're unique + */ + + const UPGRADE = "upgrade"; + const CELERY = "celery"; + + /** + * Check whether the task should be run + * + * @return bool true if the task needs to be run, otherwise false + */ + public function shouldBeRun(); + + /** + * Run the task + * + * @return void + */ + public function run(); + +} + +/** + * Class TaskFactory Factory class to abstract task instantiation + */ +class TaskFactory { + + /** + * Get an AirtimeTask based on a task type + * + * @param $task string the task type; uses AirtimeTask constants as an ENUM + * + * @return AirtimeTask|null return a task of the given type or null if no corresponding + * task exists or is implemented + */ + public static function getTask($task) { + switch($task) { + case AirtimeTask::UPGRADE: + return new UpgradeTask(); + case AirtimeTask::CELERY: + return new CeleryTask(); + } + return null; + } + +} + +/** + * Class UpgradeTask + */ +class UpgradeTask implements AirtimeTask { + + /** + * Check the current Airtime schema version to see if an upgrade should be run + * + * @return bool true if an upgrade is needed + */ + public function shouldBeRun() { + return UpgradeManager::checkIfUpgradeIsNeeded(); + } + + /** + * Run all upgrades above the current schema version + */ + public function run() { + UpgradeManager::doUpgrade(); + } + +} + +/** + * Class CeleryTask + */ +class CeleryTask implements AirtimeTask { + + /** + * Check the ThirdPartyTrackReferences table to see if there are any pending tasks + * + * @return bool true if there are pending tasks in ThirdPartyTrackReferences + */ + public function shouldBeRun() { + return !CeleryService::isBrokerTaskQueueEmpty(); + } + + /** + * Poll the task queue for any completed Celery tasks + */ + public function run() { + CeleryService::pollBrokerTaskQueue(); + } + +} \ No newline at end of file diff --git a/airtime_mvc/application/common/interface/OAuth2.php b/airtime_mvc/application/common/interface/OAuth2.php new file mode 100644 index 000000000..28283c8e8 --- /dev/null +++ b/airtime_mvc/application/common/interface/OAuth2.php @@ -0,0 +1,31 @@ +add(new Zend_Acl_Resource('library')) ->add(new Zend_Acl_Resource('billing')) ->add(new Zend_Acl_Resource('thank-you')) ->add(new Zend_Acl_Resource('provisioning')) + ->add(new Zend_Acl_Resource('player')) + ->add(new Zend_Acl_Resource('soundcloud')) ->add(new Zend_Acl_Resource('embeddablewidgets')); /** Creating permissions */ @@ -57,8 +59,9 @@ $ccAcl->allow('G', 'index') ->allow('G', 'provisioning') ->allow('G', 'downgrade') ->allow('G', 'rest:show-image', 'get') - ->allow('H', 'rest:show-image') ->allow('G', 'rest:media', 'get') + ->allow('H', 'soundcloud') + ->allow('H', 'rest:show-image') ->allow('H', 'rest:media') ->allow('H', 'preference', 'is-import-in-progress') ->allow('H', 'usersettings') @@ -71,6 +74,7 @@ $ccAcl->allow('G', 'index') ->allow('A', 'user') ->allow('A', 'systemstatus') ->allow('A', 'preference') + ->allow('A', 'player') ->allow('A', 'embeddablewidgets') ->allow('S', 'thank-you') ->allow('S', 'billing'); diff --git a/airtime_mvc/application/configs/airtime-conf.php b/airtime_mvc/application/configs/airtime-conf.php index b23a37334..ad939b2ce 100644 --- a/airtime_mvc/application/configs/airtime-conf.php +++ b/airtime_mvc/application/configs/airtime-conf.php @@ -1,6 +1,6 @@ array ( diff --git a/airtime_mvc/application/configs/classmap-airtime-conf.php b/airtime_mvc/application/configs/classmap-airtime-conf.php index 814429f76..671726a17 100644 --- a/airtime_mvc/application/configs/classmap-airtime-conf.php +++ b/airtime_mvc/application/configs/classmap-airtime-conf.php @@ -100,9 +100,15 @@ return array ( 'BaseCcWebstreamMetadataQuery' => 'airtime/om/BaseCcWebstreamMetadataQuery.php', 'BaseCcWebstreamPeer' => 'airtime/om/BaseCcWebstreamPeer.php', 'BaseCcWebstreamQuery' => 'airtime/om/BaseCcWebstreamQuery.php', + 'BaseCeleryTasks' => 'airtime/om/BaseCeleryTasks.php', + 'BaseCeleryTasksPeer' => 'airtime/om/BaseCeleryTasksPeer.php', + 'BaseCeleryTasksQuery' => 'airtime/om/BaseCeleryTasksQuery.php', 'BaseCloudFile' => 'airtime/om/BaseCloudFile.php', 'BaseCloudFilePeer' => 'airtime/om/BaseCloudFilePeer.php', 'BaseCloudFileQuery' => 'airtime/om/BaseCloudFileQuery.php', + 'BaseThirdPartyTrackReferences' => 'airtime/om/BaseThirdPartyTrackReferences.php', + 'BaseThirdPartyTrackReferencesPeer' => 'airtime/om/BaseThirdPartyTrackReferencesPeer.php', + 'BaseThirdPartyTrackReferencesQuery' => 'airtime/om/BaseThirdPartyTrackReferencesQuery.php', 'CcBlock' => 'airtime/CcBlock.php', 'CcBlockPeer' => 'airtime/CcBlockPeer.php', 'CcBlockQuery' => 'airtime/CcBlockQuery.php', @@ -235,8 +241,16 @@ return array ( 'CcWebstreamPeer' => 'airtime/CcWebstreamPeer.php', 'CcWebstreamQuery' => 'airtime/CcWebstreamQuery.php', 'CcWebstreamTableMap' => 'airtime/map/CcWebstreamTableMap.php', + 'CeleryTasks' => 'airtime/CeleryTasks.php', + 'CeleryTasksPeer' => 'airtime/CeleryTasksPeer.php', + 'CeleryTasksQuery' => 'airtime/CeleryTasksQuery.php', + 'CeleryTasksTableMap' => 'airtime/map/CeleryTasksTableMap.php', 'CloudFile' => 'airtime/CloudFile.php', 'CloudFilePeer' => 'airtime/CloudFilePeer.php', 'CloudFileQuery' => 'airtime/CloudFileQuery.php', 'CloudFileTableMap' => 'airtime/map/CloudFileTableMap.php', + 'ThirdPartyTrackReferences' => 'airtime/ThirdPartyTrackReferences.php', + 'ThirdPartyTrackReferencesPeer' => 'airtime/ThirdPartyTrackReferencesPeer.php', + 'ThirdPartyTrackReferencesQuery' => 'airtime/ThirdPartyTrackReferencesQuery.php', + 'ThirdPartyTrackReferencesTableMap' => 'airtime/map/ThirdPartyTrackReferencesTableMap.php', ); \ No newline at end of file diff --git a/airtime_mvc/application/configs/conf.php b/airtime_mvc/application/configs/conf.php index 5b11c30c8..00af3e337 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -35,6 +35,8 @@ class Config { $CC_CONFIG['baseDir'] = $values['general']['base_dir']; $CC_CONFIG['baseUrl'] = $values['general']['base_url']; $CC_CONFIG['basePort'] = $values['general']['base_port']; + $CC_CONFIG['stationId'] = $values['general']['station_id']; + $CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; if (isset($values['general']['dev_env'])) { $CC_CONFIG['dev_env'] = $values['general']['dev_env']; } else { @@ -83,7 +85,18 @@ class Config { $CC_CONFIG['soundcloud-connection-retries'] = $values['soundcloud']['connection_retries']; $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_retries']; - + + $globalAirtimeConfig = "/etc/airtime-saas/".$CC_CONFIG['dev_env']."/airtime.conf"; + if (!file_exists($globalAirtimeConfig)) { + // If the dev env specific airtime.conf doesn't exist default + // to the production airtime.conf + $globalAirtimeConfig = "/etc/airtime-saas/production/airtime.conf"; + } + $globalAirtimeConfigValues = parse_ini_file($globalAirtimeConfig, true); + $CC_CONFIG['soundcloud-client-id'] = $globalAirtimeConfigValues['soundcloud']['soundcloud_client_id']; + $CC_CONFIG['soundcloud-client-secret'] = $globalAirtimeConfigValues['soundcloud']['soundcloud_client_secret']; + $CC_CONFIG['soundcloud-redirect-uri'] = $globalAirtimeConfigValues['soundcloud']['soundcloud_redirect_uri']; + if(isset($values['demo']['demo'])){ $CC_CONFIG['demo'] = $values['demo']['demo']; } diff --git a/airtime_mvc/application/configs/config-check.php b/airtime_mvc/application/configs/config-check.php index 9cfb9927b..5ddf73295 100644 --- a/airtime_mvc/application/configs/config-check.php +++ b/airtime_mvc/application/configs/config-check.php @@ -7,17 +7,17 @@ * along with steps to fix them if they're not found or misconfigured. */ -$phpDependencies = checkPhpDependencies(); -$externalServices = checkExternalServices(); -$zend = $phpDependencies["zend"]; -$postgres = $phpDependencies["postgres"]; +$phpDependencies = checkPhpDependencies(); +$externalServices = checkExternalServices(); +$zend = $phpDependencies["zend"]; +$postgres = $phpDependencies["postgres"]; -$database = $externalServices["database"]; -$rabbitmq = $externalServices["rabbitmq"]; +$database = $externalServices["database"]; +$rabbitmq = $externalServices["rabbitmq"]; -$pypo = $externalServices["pypo"]; -$liquidsoap = $externalServices["liquidsoap"]; -$mediamonitor = $externalServices["media-monitor"]; +$pypo = $externalServices["pypo"]; +$liquidsoap = $externalServices["liquidsoap"]; +$analyzer = $externalServices["analyzer"]; $r1 = array_reduce($phpDependencies, "booleanReduce", true); $r2 = array_reduce($externalServices, "booleanReduce", true); @@ -174,28 +174,27 @@ $result = $r1 && $r2; Make sure RabbitMQ is installed correctly, and that your settings in /etc/airtime/airtime.conf are correct. Try using sudo rabbitmqctl list_users and sudo rabbitmqctl list_vhosts to see if the airtime user (or your custom RabbitMQ user) exists, then checking that - sudo rabbitmqctl list_exchanges contains entries for airtime-media-monitor, airtime-pypo, - and airtime-uploads. + sudo rabbitmqctl list_exchanges contains entries for airtime-pypo and airtime-uploads. - + - Media Monitor + Airtime Analyzer - Airtime media-monitor service + Airtime Upload and File Analysis service - + "> - Check that the airtime-media-monitor service is installed correctly in /etc/init, + Check that the airtime_analyzer service is installed correctly in /etc/init.d, and ensure that it's running with -
initctl list | grep airtime-media-monitor
- If not, try running sudo service airtime-media-monitor start +
initctl list | grep airtime_analyzer
+ If not, try running sudo service airtime_analyzer start @@ -212,7 +211,7 @@ $result = $r1 && $r2; "> - Check that the airtime-playout service is installed correctly in /etc/init, + Check that the airtime-playout service is installed correctly in /etc/init.d, and ensure that it's running with
initctl list | grep airtime-playout
If not, try running sudo service airtime-playout restart @@ -232,7 +231,7 @@ $result = $r1 && $r2; "> - Check that the airtime-liquidsoap service is installed correctly in /etc/init, + Check that the airtime-liquidsoap service is installed correctly in /etc/init.d, and ensure that it's running with
initctl list | grep airtime-liquidsoap
If not, try running sudo service airtime-liquidsoap restart diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php index c6a51ef00..4360cd9e7 100644 --- a/airtime_mvc/application/configs/constants.php +++ b/airtime_mvc/application/configs/constants.php @@ -10,7 +10,6 @@ define('COMPANY_SUFFIX' , 'z.รบ.'); define('COMPANY_SITE' , 'Sourcefabric.org'); define('COMPANY_SITE_URL' , 'http://sourcefabric.org/'); - define('HELP_URL' , 'http://help.sourcefabric.org/'); define('FAQ_URL' , 'https://sourcefabricberlin.zendesk.com/hc/en-us/sections/200994309-Airtime-FAQ'); define('WHOS_USING_URL' , 'http://sourcefabric.org/en/airtime/whosusing'); @@ -88,13 +87,6 @@ define('UI_PLAYLISTCONTROLLER_OBJ_SESSNAME', 'PLAYLISTCONTROLLER_OBJ'); /*define('UI_PLAYLIST_SESSNAME', 'PLAYLIST'); define('UI_BLOCK_SESSNAME', 'BLOCK');*/ - -// Soundcloud contants -define('SOUNDCLOUD_NOT_UPLOADED_YET' , -1); -define('SOUNDCLOUD_PROGRESS' , -2); -define('SOUNDCLOUD_ERROR' , -3); - - //WHMCS integration define("WHMCS_API_URL", "https://account.sourcefabric.com/includes/api.php"); define("SUBDOMAIN_WHMCS_CUSTOM_FIELD_NAME", "Choose your domain"); @@ -107,4 +99,16 @@ define('PROVISIONING_STATUS_SUSPENDED' , 'Suspended'); define('PROVISIONING_STATUS_ACTIVE' , 'Active'); //TuneIn integration -define("TUNEIN_API_URL", "http://air.radiotime.com/Playing.ashx"); \ No newline at end of file +define("TUNEIN_API_URL", "http://air.radiotime.com/Playing.ashx"); + +// SoundCloud +define('DEFAULT_SOUNDCLOUD_LICENSE_TYPE', 'all-rights-reserved'); +define('DEFAULT_SOUNDCLOUD_SHARING_TYPE', 'public'); + +// Celery +define('CELERY_PENDING_STATUS', 'PENDING'); +define('CELERY_SUCCESS_STATUS', 'SUCCESS'); +define('CELERY_FAILED_STATUS', 'FAILED'); + +// Celery Services +define('SOUNDCLOUD_SERVICE_NAME', 'soundcloud'); diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 955d2e356..60b1e186b 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -648,11 +648,6 @@ class ApiController extends Zend_Controller_Action // fields $file->setMetadataValue('MDATA_KEY_CREATOR', "Airtime Show Recorder"); $file->setMetadataValue('MDATA_KEY_TRACKNUMBER', $show_instance_id); - - if (!$showCanceled && Application_Model_Preference::GetAutoUploadRecordedShowToSoundcloud()) { - $id = $file->getId(); - Application_Model_Soundcloud::uploadSoundcloud($id); - } } public function mediaMonitorSetupAction() diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 00b8f84fe..2ad032973 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -265,29 +265,38 @@ class LibraryController extends Zend_Controller_Action } } - //SOUNDCLOUD MENU OPTIONS - if ($type === "audioclip" && Application_Model_Preference::GetUploadToSoundcloudOption()) { + // SOUNDCLOUD MENU OPTION + $ownerId = empty($obj) ? $file->getFileOwnerId() : $obj->getCreatorId(); + if ($isAdminOrPM || $ownerId == $user->getId()) { + $soundcloudService = new SoundcloudService(); + if ($type === "audioclip" && $soundcloudService->hasAccessToken()) { - //create a menu separator - $menu["sep1"] = "-----------"; + //create a menu separator + $menu["sep1"] = "-----------"; - //create a sub menu for Soundcloud actions. - $menu["soundcloud"] = array("name" => _("Soundcloud"), "icon" => "soundcloud", "items" => array()); + //create a sub menu for Soundcloud actions. + $menu["soundcloud"] = array("name" => _("Soundcloud"), "icon" => "soundcloud", "items" => array()); - $scid = $file->getSoundCloudId(); - - if ($scid > 0) { - $url = $file->getSoundCloudLinkToFile(); - $menu["soundcloud"]["items"]["view"] = array("name" => _("View on Soundcloud"), "icon" => "soundcloud", "url" => $url); + $serviceId = $soundcloudService->getServiceId($id); + if (!is_null($file) && $serviceId != 0) { + $menu["soundcloud"]["items"]["view"] = array("name" => _("View track"), "icon" => "soundcloud", "url" => $baseUrl . "soundcloud/view-on-sound-cloud/id/{$id}"); + $menu["soundcloud"]["items"]["remove"] = array("name" => _("Remove track"), "icon" => "soundcloud", "url" => $baseUrl . "soundcloud/delete/id/{$id}"); + } else { + // If a reference exists for this file ID, that means the user has uploaded the track + // but we haven't yet gotten a response from Celery, so disable the menu item + if ($soundcloudService->referenceExists($id)) { + $menu["soundcloud"]["items"]["upload"] = array( + "name" => _("Upload track"), "icon" => "soundcloud", + "url" => $baseUrl . "soundcloud/upload/id/{$id}", "disabled" => true + ); + } else { + $menu["soundcloud"]["items"]["upload"] = array( + "name" => _("Upload track"), "icon" => "soundcloud", + "url" => $baseUrl . "soundcloud/upload/id/{$id}" + ); + } + } } - - if (!is_null($scid)) { - $text = _("Re-upload to SoundCloud"); - } else { - $text = _("Upload to SoundCloud"); - } - - $menu["soundcloud"]["items"]["upload"] = array("name" => $text, "icon" => "soundcloud", "url" => $baseUrl."library/upload-file-soundcloud/id/{$id}"); } if (empty($menu)) { @@ -525,33 +534,4 @@ class LibraryController extends Zend_Controller_Action Logging::info($e->getMessage()); } } - - public function uploadFileSoundcloudAction() - { - $id = $this->_getParam('id'); - Application_Model_Soundcloud::uploadSoundcloud($id); - // we should die with ui info - $this->_helper->json->sendJson(null); - } - - public function getUploadToSoundcloudStatusAction() - { - $id = $this->_getParam('id'); - $type = $this->_getParam('type'); - - if ($type == "show") { - $show_instance = new Application_Model_ShowInstance($id); - $this->view->sc_id = $show_instance->getSoundCloudFileId(); - $file = $show_instance->getRecordedFile(); - $this->view->error_code = $file->getSoundCloudErrorCode(); - $this->view->error_msg = $file->getSoundCloudErrorMsg(); - } elseif ($type == "file") { - $file = Application_Model_StoredFile::RecallById($id); - $this->view->sc_id = $file->getSoundCloudId(); - $this->view->error_code = $file->getSoundCloudErrorCode(); - $this->view->error_msg = $file->getSoundCloudErrorMsg(); - } else { - Logging::warn("Trying to upload unknown type: $type with id: $id"); - } - } } diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php index d705af955..5803d3223 100644 --- a/airtime_mvc/application/controllers/PreferenceController.php +++ b/airtime_mvc/application/controllers/PreferenceController.php @@ -62,14 +62,9 @@ class PreferenceController extends Zend_Controller_Action Application_Model_Preference::setTuneinPartnerKey($values["tunein_partner_key"]); Application_Model_Preference::setTuneinPartnerId($values["tunein_partner_id"]); - /*Application_Model_Preference::SetUploadToSoundcloudOption($values["UploadToSoundcloudOption"]); - Application_Model_Preference::SetSoundCloudDownloadbleOption($values["SoundCloudDownloadbleOption"]); - Application_Model_Preference::SetSoundCloudUser($values["SoundCloudUser"]); - Application_Model_Preference::SetSoundCloudPassword($values["SoundCloudPassword"]); - Application_Model_Preference::SetSoundCloudTags($values["SoundCloudTags"]); - Application_Model_Preference::SetSoundCloudGenre($values["SoundCloudGenre"]); - Application_Model_Preference::SetSoundCloudTrackType($values["SoundCloudTrackType"]); - Application_Model_Preference::SetSoundCloudLicense($values["SoundCloudLicense"]);*/ + // SoundCloud Preferences + Application_Model_Preference::setDefaultSoundCloudLicenseType($values["SoundCloudLicense"]); + Application_Model_Preference::setDefaultSoundCloudSharingType($values["SoundCloudSharing"]); $this->view->statusMsg = "
". _("Preferences updated.")."
"; $form = new Application_Form_Preferences(); diff --git a/airtime_mvc/application/controllers/ScheduleController.php b/airtime_mvc/application/controllers/ScheduleController.php index 1890ac200..4760e7f3d 100644 --- a/airtime_mvc/application/controllers/ScheduleController.php +++ b/airtime_mvc/application/controllers/ScheduleController.php @@ -253,25 +253,6 @@ class ScheduleController extends Zend_Controller_Action $this->view->show_id = $showId; } - public function uploadToSoundCloudAction() - { - $show_instance = $this->_getParam('id'); - - try { - $show_inst = new Application_Model_ShowInstance($show_instance); - } catch (Exception $e) { - $this->view->show_error = true; - - return false; - } - - $file = $show_inst->getRecordedFile(); - $id = $file->getId(); - Application_Model_Soundcloud::uploadSoundcloud($id); - // we should die with ui info - $this->_helper->json->sendJson(null); - } - public function makeContextMenuAction() { $instanceId = $this->_getParam('instanceId'); diff --git a/airtime_mvc/application/controllers/SoundcloudController.php b/airtime_mvc/application/controllers/SoundcloudController.php new file mode 100644 index 000000000..1a7c86eb4 --- /dev/null +++ b/airtime_mvc/application/controllers/SoundcloudController.php @@ -0,0 +1,41 @@ +_service = new SoundcloudService(); + } + + /** + * Fetch the permalink to a file on SoundCloud and redirect to it. + */ + public function viewOnSoundCloudAction() { + $request = $this->getRequest(); + $id = $request->getParam('id'); + try { + $soundcloudLink = $this->_service->getLinkToFile($id); + header('Location: ' . $soundcloudLink); + } catch (Soundcloud\Exception\InvalidHttpResponseCodeException $e) { + // Redirect to a 404 so the user knows something went wrong + header('Location: ' . $this->_baseUrl . 'error/error-404'); + } + } + +} diff --git a/airtime_mvc/application/controllers/ThirdPartyController.php b/airtime_mvc/application/controllers/ThirdPartyController.php new file mode 100644 index 000000000..5c15ae5ea --- /dev/null +++ b/airtime_mvc/application/controllers/ThirdPartyController.php @@ -0,0 +1,93 @@ +_baseUrl = 'http://' . $CC_CONFIG['baseUrl'] . ":" . $CC_CONFIG['basePort'] . "/"; + + $this->view->layout()->disableLayout(); // Don't inject the standard Now Playing header. + $this->_helper->viewRenderer->setNoRender(true); // Don't use (phtml) templates + } + + /** + * Send user to a third-party service to authorize before being redirected + * + * @return void + */ + public function authorizeAction() { + $auth_url = $this->_service->getAuthorizeUrl(); + header('Location: ' . $auth_url); + } + + /** + * Clear the previously saved request token from the preferences + * + * @return void + */ + public function deauthorizeAction() { + $function = $this->_SERVICE_TOKEN_ACCESSOR; + Application_Model_Preference::$function(""); + header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page + } + + /** + * Called when user successfully completes third-party authorization + * Store the returned request token for future requests + * + * @return void + */ + public function redirectAction() { + $code = $_GET['code']; + $this->_service->requestNewAccessToken($code); + header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page + } + + /** + * Upload the file with the given id to a third-party service + * + * @return void + * + * @throws Zend_Controller_Response_Exception thrown if upload fails for any reason + */ + public function uploadAction() { + $request = $this->getRequest(); + $id = $request->getParam('id'); + $this->_service->upload($id); + } + + /** + * Delete the file with the given id from a third-party service + * + * @return void + * + * @throws Zend_Controller_Response_Exception thrown if deletion fails for any reason + */ + public function deleteAction() { + $request = $this->getRequest(); + $id = $request->getParam('id'); + $this->_service->delete($id); + } + +} \ No newline at end of file diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php index 2da9de1b0..465ab9f2b 100644 --- a/airtime_mvc/application/controllers/UpgradeController.php +++ b/airtime_mvc/application/controllers/UpgradeController.php @@ -9,14 +9,13 @@ class UpgradeController extends Zend_Controller_Action $this->view->layout()->disableLayout(); $this->_helper->viewRenderer->setNoRender(true); - if (!$this->verifyAuth()) { + if (!RestAuth::verifyAuth(true, false, $this)) { return; } try { - $upgradeManager = new UpgradeManager(); - $didWePerformAnUpgrade = $upgradeManager->doUpgrade(); - + $didWePerformAnUpgrade = UpgradeManager::doUpgrade(); + if (!$didWePerformAnUpgrade) { $this->getResponse() ->setHttpResponseCode(200) @@ -35,27 +34,34 @@ class UpgradeController extends Zend_Controller_Action } } - private function verifyAuth() - { - //The API key is passed in via HTTP "basic authentication": - //http://en.wikipedia.org/wiki/Basic_access_authentication - - $CC_CONFIG = Config::getConfig(); - - //Decode the API key that was passed to us in the HTTP request. - $authHeader = $this->getRequest()->getHeader("Authorization"); + public function downgradeAction() { + $this->view->layout()->disableLayout(); + $this->_helper->viewRenderer->setNoRender(true); - $encodedRequestApiKey = substr($authHeader, strlen("Basic ")); - $encodedStoredApiKey = base64_encode($CC_CONFIG["apiKey"][0] . ":"); - - if ($encodedRequestApiKey !== $encodedStoredApiKey) - { - $this->getResponse() - ->setHttpResponseCode(401) - ->appendBody("Error: Incorrect API key.
"); - return false; + if (!RestAuth::verifyAuth(true, false, $this)) { + return; + } + + $request = $this->getRequest(); + $toVersion = $request->getParam("version"); + + try { + $downgradePerformed = UpgradeManager::doDowngrade($toVersion); + + if (!$downgradePerformed) { + $this->getResponse() + ->setHttpResponseCode(200) + ->appendBody("No downgrade was performed. The current schema version is " . Application_Model_Preference::GetSchemaVersion() . ".
"); + } else { + $this->getResponse() + ->setHttpResponseCode(200) + ->appendBody("Downgrade to Airtime schema version " . Application_Model_Preference::GetSchemaVersion() . " OK
"); + } + } catch (Exception $e) { + $this->getResponse() + ->setHttpResponseCode(400) + ->appendBody($e->getMessage()); } - return true; } } diff --git a/airtime_mvc/application/controllers/downgrade_sql/airtime_2.5.13/downgrade.sql b/airtime_mvc/application/controllers/downgrade_sql/airtime_2.5.13/downgrade.sql new file mode 100644 index 000000000..5943649f2 --- /dev/null +++ b/airtime_mvc/application/controllers/downgrade_sql/airtime_2.5.13/downgrade.sql @@ -0,0 +1,11 @@ +----------------------------------------------------------------------- +-- third_party_track_references +----------------------------------------------------------------------- + +DROP TABLE IF EXISTS "third_party_track_references" CASCADE; + +----------------------------------------------------------------------- +-- celery_tasks +----------------------------------------------------------------------- + +DROP TABLE IF EXISTS "celery_tasks" CASCADE; \ No newline at end of file diff --git a/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.13/upgrade.sql b/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.13/upgrade.sql new file mode 100644 index 000000000..42ba8a8d0 --- /dev/null +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.13/upgrade.sql @@ -0,0 +1,42 @@ +----------------------------------------------------------------------- +-- third_party_track_references +----------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS "third_party_track_references" +( + "id" serial NOT NULL, + "service" VARCHAR(256) NOT NULL, + "foreign_id" VARCHAR(256), + "file_id" INTEGER NOT NULL, + "upload_time" TIMESTAMP, + "status" VARCHAR(256), + PRIMARY KEY ("id"), + CONSTRAINT "foreign_id_unique" UNIQUE ("foreign_id") +); + +----------------------------------------------------------------------- +-- celery_tasks +----------------------------------------------------------------------- + +CREATE TABLE IF NOT EXISTS "celery_tasks" +( + "id" serial NOT NULL, + "task_id" VARCHAR(256) NOT NULL, + "track_reference" INTEGER NOT NULL, + "name" VARCHAR(256), + "dispatch_time" TIMESTAMP, + "status" VARCHAR(256) NOT NULL, + PRIMARY KEY ("id"), + CONSTRAINT "id_unique" UNIQUE ("id") +); + + +ALTER TABLE "third_party_track_references" ADD CONSTRAINT "track_reference_fkey" + FOREIGN KEY ("file_id") + REFERENCES "cc_files" ("id") + ON DELETE CASCADE; + +ALTER TABLE "celery_tasks" ADD CONSTRAINT "celery_service_fkey" + FOREIGN KEY ("track_reference") + REFERENCES "third_party_track_references" ("id") + ON DELETE CASCADE; diff --git a/airtime_mvc/application/forms/EmailServerPreferences.php b/airtime_mvc/application/forms/EmailServerPreferences.php index d49cdd3fb..1e0feda79 100644 --- a/airtime_mvc/application/forms/EmailServerPreferences.php +++ b/airtime_mvc/application/forms/EmailServerPreferences.php @@ -1,6 +1,5 @@ addSubForm($tuneinPreferences, 'preferences_tunein'); - $soundcloud_pref = new Application_Form_SoundcloudPreferences(); + $soundcloud_pref = new Application_Form_SoundCloudPreferences(); $this->addSubForm($soundcloud_pref, 'preferences_soundcloud'); $danger_pref = new Application_Form_DangerousPreferences(); diff --git a/airtime_mvc/application/forms/SoundCloudPreferences.php b/airtime_mvc/application/forms/SoundCloudPreferences.php new file mode 100644 index 000000000..987244ced --- /dev/null +++ b/airtime_mvc/application/forms/SoundCloudPreferences.php @@ -0,0 +1,57 @@ +setDecorators(array( + array('ViewScript', array('viewScript' => 'form/preferences_soundcloud.phtml')) + )); + + $select = new Zend_Form_Element_Select('SoundCloudLicense'); + $select->setLabel(_('Default License:')); + $select->setAttrib('class', 'input_select'); + $select->setMultiOptions(array( + "all-rights-reserved" => _("All rights are reserved"), + "no-rights-reserved" => _("The work is in the public domain"), + "cc-by" => _("Creative Commons Attribution"), + "cc-by-nc" => _("Creative Commons Attribution Noncommercial"), + "cc-by-nd" => _("Creative Commons Attribution No Derivative Works"), + "cc-by-sa" => _("Creative Commons Attribution Share Alike"), + "cc-by-nc-nd" => _("Creative Commons Attribution Noncommercial Non Derivate Works"), + "cc-by-nc-sa" => _("Creative Commons Attribution Noncommercial Share Alike") + )); + $select->setRequired(false); + $select->setValue(Application_Model_Preference::getDefaultSoundCloudLicenseType()); + $this->addElement($select); + + $select = new Zend_Form_Element_Select('SoundCloudSharing'); + $select->setLabel(_('Default Sharing Type:')); + $select->setAttrib('class', 'input_select'); + $select->setMultiOptions(array( + "public" => _("Public"), + "private" => _("Private"), + )); + $select->setRequired(false); + $select->setValue(Application_Model_Preference::getDefaultSoundCloudSharingType()); + $this->addElement($select); + + $this->addElement('image', 'SoundCloudConnect', array( + 'src' => 'http://connect.soundcloud.com/2/btn-connect-sc-l.png', + 'decorators' => array( + 'ViewHelper' + ) + )); + + $this->addElement('image', 'SoundCloudDisconnect', array( + 'src' => 'http://connect.soundcloud.com/2/btn-disconnect-l.png', + 'decorators' => array( + 'ViewHelper' + ) + )); + + } + +} diff --git a/airtime_mvc/application/forms/SoundcloudPreferences.php b/airtime_mvc/application/forms/SoundcloudPreferences.php deleted file mode 100644 index 3d1563a65..000000000 --- a/airtime_mvc/application/forms/SoundcloudPreferences.php +++ /dev/null @@ -1,142 +0,0 @@ -setDecorators(array( - array('ViewScript', array('viewScript' => 'form/preferences_soundcloud.phtml')) - )); - - //enable soundcloud uploads option - $this->addElement('checkbox', 'UploadToSoundcloudOption', array( - 'label' => _('Enable SoundCloud Upload'), - 'required' => false, - 'value' => Application_Model_Preference::GetUploadToSoundcloudOption(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - //enable downloadable for soundcloud - $this->addElement('checkbox', 'SoundCloudDownloadbleOption', array( - 'label' => _('Automatically Mark Files "Downloadable" on SoundCloud'), - 'required' => false, - 'value' => Application_Model_Preference::GetSoundCloudDownloadbleOption(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - //SoundCloud Username - $this->addElement('text', 'SoundCloudUser', array( - 'class' => 'input_text', - 'label' => _('SoundCloud Email'), - 'filters' => array('StringTrim'), - 'autocomplete' => 'off', - 'value' => Application_Model_Preference::GetSoundCloudUser(), - 'decorators' => array( - 'ViewHelper' - ), - - // By default, 'allowEmpty' is true. This means that our custom - // validators are going to be skipped if this field is empty, - // which is something we don't want - 'allowEmpty' => false, - 'validators' => array( - new ConditionalNotEmpty(array('UploadToSoundcloudOption'=>'1')) - ) - )); - - //SoundCloud Password - $this->addElement('password', 'SoundCloudPassword', array( - 'class' => 'input_text', - 'label' => _('SoundCloud Password'), - 'filters' => array('StringTrim'), - 'autocomplete' => 'off', - 'value' => Application_Model_Preference::GetSoundCloudPassword(), - 'decorators' => array( - 'ViewHelper' - ), - - // By default, 'allowEmpty' is true. This means that our custom - // validators are going to be skipped if this field is empty, - // which is something we don't want - 'allowEmpty' => false, - 'validators' => array( - new ConditionalNotEmpty(array('UploadToSoundcloudOption'=>'1')) - ), - 'renderPassword' => true - )); - - // Add the description element - $this->addElement('textarea', 'SoundCloudTags', array( - 'label' => _('SoundCloud Tags: (separate tags with spaces)'), - 'required' => false, - 'class' => 'input_text_area', - 'value' => Application_Model_Preference::GetSoundCloudTags(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - //SoundCloud default genre - $this->addElement('text', 'SoundCloudGenre', array( - 'class' => 'input_text', - 'label' => _('Default Genre:'), - 'required' => false, - 'filters' => array('StringTrim'), - 'value' => Application_Model_Preference::GetSoundCloudGenre(), - 'decorators' => array( - 'ViewHelper' - ) - )); - - $select = new Zend_Form_Element_Select('SoundCloudTrackType'); - $select->setLabel(_('Default Track Type:')); - $select->setAttrib('class', 'input_select'); - $select->setMultiOptions(array( - "" => "", - "original" => _("Original"), - "remix" => _("Remix"), - "live" => _("Live"), - "recording" => _("Recording"), - "spoken" => _("Spoken"), - "podcast" => _("Podcast"), - "demo" => _("Demo"), - "in progress" => _("Work in progress"), - "stem" => _("Stem"), - "loop" => _("Loop"), - "sound effect" => _("Sound Effect"), - "sample" => _("One Shot Sample"), - "other" => _("Other") - )); - $select->setRequired(false); - $select->setValue(Application_Model_Preference::GetSoundCloudTrackType()); - $select->setDecorators(array('ViewHelper')); - $this->addElement($select); - - $select = new Zend_Form_Element_Select('SoundCloudLicense'); - $select->setLabel(_('Default License:')); - $select->setAttrib('class', 'input_select'); - $select->setMultiOptions(array( - "" => "", - "no-rights-reserved" => _("The work is in the public domain"), - "all-rights-reserved" => _("All rights are reserved"), - "cc-by" => _("Creative Commons Attribution"), - "cc-by-nc" => _("Creative Commons Attribution Noncommercial"), - "cc-by-nd" => _("Creative Commons Attribution No Derivative Works"), - "cc-by-sa" => _("Creative Commons Attribution Share Alike"), - "cc-by-nc-nd" => _("Creative Commons Attribution Noncommercial Non Derivate Works"), - "cc-by-nc-sa" => _("Creative Commons Attribution Noncommercial Share Alike") - )); - $select->setRequired(false); - $select->setValue(Application_Model_Preference::GetSoundCloudLicense()); - $select->setDecorators(array('ViewHelper')); - $this->addElement($select); - } - -} diff --git a/airtime_mvc/application/forms/customvalidators/PasswordNotEmpty.php b/airtime_mvc/application/forms/customvalidators/PasswordNotEmpty.php deleted file mode 100644 index 5073c5d80..000000000 --- a/airtime_mvc/application/forms/customvalidators/PasswordNotEmpty.php +++ /dev/null @@ -1,18 +0,0 @@ - 0) - self::setValue("soundcloud_password", $password); - } - - public static function GetSoundCloudPassword() - { - return self::getValue("soundcloud_password"); - } - - public static function SetSoundCloudTags($tags) - { - self::setValue("soundcloud_tags", $tags); - } - - public static function GetSoundCloudTags() - { - return self::getValue("soundcloud_tags"); - } - - public static function SetSoundCloudGenre($genre) - { - self::setValue("soundcloud_genre", $genre); - } - - public static function GetSoundCloudGenre() - { - return self::getValue("soundcloud_genre"); - } - - public static function SetSoundCloudTrackType($track_type) - { - self::setValue("soundcloud_tracktype", $track_type); - } - - public static function GetSoundCloudTrackType() - { - return self::getValue("soundcloud_tracktype"); - } - - public static function SetSoundCloudLicense($license) - { - self::setValue("soundcloud_license", $license); - } - - public static function GetSoundCloudLicense() - { - return self::getValue("soundcloud_license"); - } - public static function SetAllow3rdPartyApi($bool) { self::setValue("third_party_api", $bool); @@ -673,12 +602,6 @@ class Application_Model_Preference $outputArray['LIVE_DURATION'] = Application_Model_LiveLog::GetLiveShowDuration($p_testing); $outputArray['SCHEDULED_DURATION'] = Application_Model_LiveLog::GetScheduledDuration($p_testing); - $outputArray['SOUNDCLOUD_ENABLED'] = self::GetUploadToSoundcloudOption(); - if ($outputArray['SOUNDCLOUD_ENABLED']) { - $outputArray['NUM_SOUNDCLOUD_TRACKS_UPLOADED'] = Application_Model_StoredFile::getSoundCloudUploads(); - } else { - $outputArray['NUM_SOUNDCLOUD_TRACKS_UPLOADED'] = NULL; - } $outputArray['STATION_NAME'] = self::GetStationName(); $outputArray['PHONE'] = self::GetPhone(); @@ -724,12 +647,6 @@ class Application_Model_Preference $outputString .= "\t".strtoupper($k)." : ".$v."\n"; } } - } elseif ($key == "SOUNDCLOUD_ENABLED") { - if ($out) { - $outputString .= $key." : TRUE\n"; - } elseif (!$out) { - $outputString .= $key." : FALSE\n"; - } } elseif ($key == "SAAS") { $outputString .= $key.' : '.$out."\n"; } else { @@ -976,26 +893,6 @@ class Application_Model_Preference } } - public static function SetUploadToSoundcloudOption($upload) - { - self::setValue("soundcloud_upload_option", $upload); - } - - public static function GetUploadToSoundcloudOption() - { - return self::getValue("soundcloud_upload_option"); - } - - public static function SetSoundCloudDownloadbleOption($upload) - { - self::setValue("soundcloud_downloadable", $upload); - } - - public static function GetSoundCloudDownloadbleOption() - { - return self::getValue("soundcloud_downloadable"); - } - public static function SetWeekStartDay($day) { self::setValue("week_start_day", $day); @@ -1135,7 +1032,7 @@ class Application_Model_Preference public static function GetDiskQuota() { $val = self::getValue("disk_quota"); - return (strlen($val) == 0) ? 0 : $val; + return empty($val) ? 2147483648 : $val; # If there is no value for disk quota, return 2GB } public static function SetLiveStreamMasterUsername($value) @@ -1549,4 +1446,47 @@ class Application_Model_Preference { self::setValue("last_tunein_metadata_update", $value); } + + /* Third Party */ + + // SoundCloud + + public static function getDefaultSoundCloudLicenseType() { + $val = self::getValue("soundcloud_license_type"); + // If we don't have a value set, return all-rights-reserved by default + return empty($val) ? DEFAULT_SOUNDCLOUD_LICENSE_TYPE : $val; + } + + public static function setDefaultSoundCloudLicenseType($value) { + self::setValue("soundcloud_license_type", $value); + } + + public static function getDefaultSoundCloudSharingType() { + $val = self::getValue("soundcloud_sharing_type"); + // If we don't have a value set, return public by default + return empty($val) ? DEFAULT_SOUNDCLOUD_SHARING_TYPE : $val; + } + + public static function setDefaultSoundCloudSharingType($value) { + self::setValue("soundcloud_sharing_type", $value); + } + + public static function getSoundCloudRequestToken() { + return self::getValue("soundcloud_request_token"); + } + + public static function setSoundCloudRequestToken($value) { + self::setValue("soundcloud_request_token", $value); + } + + // TaskManager Lock Timestamp + + public static function getTaskManagerLock() { + return self::getValue("task_manager_lock"); + } + + public static function setTaskManagerLock($value) { + self::setValue("task_manager_lock", $value); + } + } diff --git a/airtime_mvc/application/models/RabbitMq.php b/airtime_mvc/application/models/RabbitMq.php index fa05f3986..87a89336d 100644 --- a/airtime_mvc/application/models/RabbitMq.php +++ b/airtime_mvc/application/models/RabbitMq.php @@ -1,5 +1,6 @@ $show[0]["starts"], - "ends" => $show[0]["ends"], - "type" => _("livestream"), - "name" => (isset($show[0])?$show[0]["name"]:"") . " - " . _(self::LIVE_STREAM), + $results["current"] = isset($show[0]) ? array( + "starts" => $show[0]["starts"], + "ends" => $show[0]["ends"], + "type" => _("livestream"), + "name" => $show[0]["name"] . " - " . _(self::LIVE_STREAM), "media_item_played" => false, - "record" => "0" - ); + "record" => "0" + ) : null; } else if (count($rows) >= 1) { $currentMedia = $rows[0]; diff --git a/airtime_mvc/application/models/ShowBuilder.php b/airtime_mvc/application/models/ShowBuilder.php index 2352bedb4..bd57fdff8 100644 --- a/airtime_mvc/application/models/ShowBuilder.php +++ b/airtime_mvc/application/models/ShowBuilder.php @@ -212,16 +212,6 @@ class Application_Model_ShowBuilder $row["rebroadcast_title"] = sprintf(_("Rebroadcast of %s from %s"), $name, $time); } elseif (intval($p_item["si_record"]) === 1) { $row["record"] = true; - - // at the time of creating on show, the recorded file is not in the DB yet. - // therefore, 'si_file_id' is null. So we need to check it. - if (Application_Model_Preference::GetUploadToSoundcloudOption() && isset($p_item['si_file_id'])) { - $file = Application_Model_StoredFile::RecallById($p_item['si_file_id']); - if (isset($file)) { - $sid = $file->getSoundCloudId(); - $row['soundcloud_id'] = $sid; - } - } } if ($startsEpoch < $this->epoch_now && $endsEpoch > $this->epoch_now) { diff --git a/airtime_mvc/application/models/ShowInstance.php b/airtime_mvc/application/models/ShowInstance.php index 5fc456ee4..88cf201c7 100644 --- a/airtime_mvc/application/models/ShowInstance.php +++ b/airtime_mvc/application/models/ShowInstance.php @@ -118,19 +118,6 @@ SQL; return $showStartExplode[1]; } - public function setSoundCloudFileId($p_soundcloud_id) - { - $file = Application_Model_StoredFile::RecallById($this->_showInstance->getDbRecordedFile()); - $file->setSoundCloudFileId($p_soundcloud_id); - } - - public function getSoundCloudFileId() - { - $file = Application_Model_StoredFile::RecallById($this->_showInstance->getDbRecordedFile()); - - return $file->getSoundCloudId(); - } - public function getRecordedFile() { $file_id = $this->_showInstance->getDbRecordedFile(); diff --git a/airtime_mvc/application/models/Soundcloud.php b/airtime_mvc/application/models/Soundcloud.php deleted file mode 100644 index 6c7b181d7..000000000 --- a/airtime_mvc/application/models/Soundcloud.php +++ /dev/null @@ -1,99 +0,0 @@ -_soundcloud = new Services_Soundcloud( - $CC_CONFIG['soundcloud-client-id'], - $CC_CONFIG['soundcloud-client-secret']); - } - - private function getToken() - { - $username = Application_Model_Preference::GetSoundCloudUser(); - $password = Application_Model_Preference::GetSoundCloudPassword(); - - $token = $this->_soundcloud->accessTokenResourceOwner($username, $password); - - return $token; - } - - public function uploadTrack($filepath, $filename, $description, - $tags=array(), $release=null, $genre=null) - { - - if (!$this->getToken()) { - throw new NoSoundCloundToken(); - } - if (count($tags)) { - $tags = join(" ", $tags); - $tags = $tags." ".Application_Model_Preference::GetSoundCloudTags(); - } else { - $tags = Application_Model_Preference::GetSoundCloudTags(); - } - - $downloadable = Application_Model_Preference::GetSoundCloudDownloadbleOption() == '1'; - - $track_data = array( - 'track[sharing]' => 'private', - 'track[title]' => $filename, - 'track[asset_data]' => '@' . $filepath, - 'track[tag_list]' => $tags, - 'track[description]' => $description, - 'track[downloadable]' => $downloadable, - - ); - - if (isset($release)) { - $release = str_replace(" ", "-", $release); - $release = str_replace(":", "-", $release); - - //YYYY-MM-DD-HH-mm-SS - $release = explode("-", $release); - $track_data['track[release_year]'] = $release[0]; - $track_data['track[release_month]'] = $release[1]; - $track_data['track[release_day]'] = $release[2]; - } - - if (isset($genre) && $genre != "") { - $track_data['track[genre]'] = $genre; - } else { - $default_genre = Application_Model_Preference::GetSoundCloudGenre(); - if ($default_genre != "") { - $track_data['track[genre]'] = $default_genre; - } - } - - $track_type = Application_Model_Preference::GetSoundCloudTrackType(); - if ($track_type != "") { - $track_data['track[track_type]'] = $track_type; - } - - $license = Application_Model_Preference::GetSoundCloudLicense(); - if ($license != "") { - $track_data['track[license]'] = $license; - } - - $response = json_decode( - $this->_soundcloud->post('tracks', $track_data), - true - ); - - return $response; - - } - - public static function uploadSoundcloud($id) - { - $cmd = "/usr/lib/airtime/utils/soundcloud-uploader $id > /dev/null &"; - Logging::info("Uploading soundcloud with command: $cmd"); - exec($cmd); - } -} - -class NoSoundCloundToken extends Exception {} diff --git a/airtime_mvc/application/models/StoredFile.php b/airtime_mvc/application/models/StoredFile.php index 3ff446ddf..58fe8a703 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -73,6 +73,9 @@ class Application_Model_StoredFile return $this->_file->getDbFtype(); } + /** + * @return CcFiles + */ public function getPropelOrm() { return $this->_file; @@ -616,6 +619,13 @@ SQL; /* TODO: Callers of this function should use a Propel transaction. Start * by creating $con outside the function with beingTransaction() */ + /** + * @param int $p_id + * @param \Doctrine\DBAL\Driver\PDOConnection $con + * + * @return Application_Model_StoredFile + * @throws Exception + */ public static function RecallById($p_id=null, $con=null) { //TODO if (is_null($con)) { @@ -898,10 +908,6 @@ SQL; $formatter = new BitrateFormatter($row['bit_rate']); $row['bit_rate'] = $formatter->format(); - //soundcloud status - $file = Application_Model_StoredFile::RecallById($row['id']); - $row['soundcloud_id'] = $file->getSoundCloudId(); - // for audio preview $row['audioFile'] = $row['id'].".".pathinfo($row['filepath'], PATHINFO_EXTENSION); @@ -1133,77 +1139,6 @@ SQL; return $rows; } - /* Gets number of tracks uploaded to - * Soundcloud in the last 24 hours - */ - public static function getSoundCloudUploads() - { - try { - - $sql = <<= (now() - (INTERVAL '1 day'))) -SQL; - - $rows = Application_Common_Database::prepareAndExecute($sql); - - return count($rows); - } catch (Exception $e) { - header('HTTP/1.0 503 Service Unavailable'); - Logging::info("Could not connect to database."); - exit; - } - - } - - public function setSoundCloudLinkToFile($link_to_file) - { - $this->_file->setDbSoundCloudLinkToFile($link_to_file) - ->save(); - } - - public function getSoundCloudLinkToFile() - { - return $this->_file->getDbSoundCloudLinkToFile(); - } - - public function setSoundCloudFileId($p_soundcloud_id) - { - $this->_file->setDbSoundCloudId($p_soundcloud_id) - ->save(); - } - - public function getSoundCloudId() - { - return $this->_file->getDbSoundCloudId(); - } - - public function setSoundCloudErrorCode($code) - { - $this->_file->setDbSoundCloudErrorCode($code) - ->save(); - } - - public function getSoundCloudErrorCode() - { - return $this->_file->getDbSoundCloudErrorCode(); - } - - public function setSoundCloudErrorMsg($msg) - { - $this->_file->setDbSoundCloudErrorMsg($msg) - ->save(); - } - - public function getSoundCloudErrorMsg() - { - return $this->_file->getDbSoundCloudErrorMsg(); - } - public function getDirectory() { return $this->_file->getDbDirectory(); @@ -1219,12 +1154,6 @@ SQL; $this->_file->setDbHidden($flag) ->save(); } - public function setSoundCloudUploadTime($time) - { - $this->_file->setDbSoundCloundUploadTime($time) - ->save(); - } - // This method seems to be unsued everywhere so I've commented it out // If it's absence does not have any effect then it will be completely @@ -1239,51 +1168,6 @@ SQL; return $this->_file->getDbOwnerId(); } - // note: never call this method from controllers because it does a sleep - public function uploadToSoundCloud() - { - $CC_CONFIG = Config::getConfig(); - - $file = $this->_file; - if (is_null($file)) { - return "File does not exist"; - } - if (Application_Model_Preference::GetUploadToSoundcloudOption()) { - for ($i=0; $i<$CC_CONFIG['soundcloud-connection-retries']; $i++) { - $description = $file->getDbTrackTitle(); - $tag = array(); - $genre = $file->getDbGenre(); - $release = $file->getDbUtime(); - try { - $filePaths = $this->getFilePaths(); - $filePath = $filePaths[0]; - $soundcloud = new Application_Model_Soundcloud(); - $soundcloud_res = $soundcloud->uploadTrack( - $filePath, $this->getName(), $description, - $tag, $release, $genre); - $this->setSoundCloudFileId($soundcloud_res['id']); - $this->setSoundCloudLinkToFile($soundcloud_res['permalink_url']); - $this->setSoundCloudUploadTime(new DateTime("now"), new DateTimeZone("UTC")); - break; - } catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) { - $code = $e->getHttpCode(); - $msg = $e->getHttpBody(); - // TODO : Do not parse JSON by hand - $temp = explode('"error":',$msg); - $msg = trim($temp[1], '"}'); - $this->setSoundCloudErrorCode($code); - $this->setSoundCloudErrorMsg($msg); - // setting sc id to -3 which indicates error - $this->setSoundCloudFileId(SOUNDCLOUD_ERROR); - if (!in_array($code, array(0, 100))) { - break; - } - } - - sleep($CC_CONFIG['soundcloud-connection-wait']); - } - } - } public static function setIsPlaylist($p_playlistItems, $p_type, $p_status) { foreach ($p_playlistItems as $item) { diff --git a/airtime_mvc/application/models/airtime/CcFiles.php b/airtime_mvc/application/models/airtime/CcFiles.php index 4140485ea..16fb99c67 100644 --- a/airtime_mvc/application/models/airtime/CcFiles.php +++ b/airtime_mvc/application/models/airtime/CcFiles.php @@ -74,6 +74,8 @@ class CcFiles extends BaseCcFiles { /** Used to create a CcFiles object from an array containing metadata and a file uploaded by POST. * This is used by our Media REST API! * @param $fileArray An array containing metadata for a CcFiles object. + * + * @return object the sanitized response * @throws Exception */ public static function createFromUpload($fileArray) @@ -94,7 +96,7 @@ class CcFiles extends BaseCcFiles { $tempFilePath = $_FILES['file']['tmp_name']; try { - self::createAndImport($fileArray, $tempFilePath, $originalFilename); + return self::createAndImport($fileArray, $tempFilePath, $originalFilename); } catch (Exception $e) { if (file_exists($tempFilePath)) { unlink($tempFilePath); diff --git a/airtime_mvc/application/models/airtime/CeleryTasks.php b/airtime_mvc/application/models/airtime/CeleryTasks.php new file mode 100644 index 000000000..f91e22a5d --- /dev/null +++ b/airtime_mvc/application/models/airtime/CeleryTasks.php @@ -0,0 +1,18 @@ +addRelation('CcBlockcontents', 'CcBlockcontents', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null, 'CcBlockcontentss'); $this->addRelation('CcSchedule', 'CcSchedule', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null, 'CcSchedules'); $this->addRelation('CcPlayoutHistory', 'CcPlayoutHistory', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null, 'CcPlayoutHistorys'); + $this->addRelation('ThirdPartyTrackReferences', 'ThirdPartyTrackReferences', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null, 'ThirdPartyTrackReferencess'); } // buildRelations() } // CcFilesTableMap diff --git a/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php b/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php index 0b22cef8f..0a52454dc 100644 --- a/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcShowInstancesTableMap.php @@ -40,7 +40,7 @@ class CcShowInstancesTableMap extends TableMap $this->setPrimaryKeyMethodInfo('cc_show_instances_id_seq'); // columns $this->addPrimaryKey('id', 'DbId', 'INTEGER', true, null, null); - $this->addColumn('description', 'DbDescription', 'VARCHAR', false, 512, ''); + $this->addColumn('description', 'DbDescription', 'VARCHAR', false, 8192, ''); $this->addColumn('starts', 'DbStarts', 'TIMESTAMP', true, null, null); $this->addColumn('ends', 'DbEnds', 'TIMESTAMP', true, null, null); $this->addForeignKey('show_id', 'DbShowId', 'INTEGER', 'cc_show', 'id', true, null, null); diff --git a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php index c7442c83a..73ba89fac 100644 --- a/airtime_mvc/application/models/airtime/map/CcShowTableMap.php +++ b/airtime_mvc/application/models/airtime/map/CcShowTableMap.php @@ -43,7 +43,7 @@ class CcShowTableMap extends TableMap $this->addColumn('name', 'DbName', 'VARCHAR', true, 255, ''); $this->addColumn('url', 'DbUrl', 'VARCHAR', false, 255, ''); $this->addColumn('genre', 'DbGenre', 'VARCHAR', false, 255, ''); - $this->addColumn('description', 'DbDescription', 'VARCHAR', false, 512, null); + $this->addColumn('description', 'DbDescription', 'VARCHAR', false, 8192, null); $this->addColumn('color', 'DbColor', 'VARCHAR', false, 6, null); $this->addColumn('background_color', 'DbBackgroundColor', 'VARCHAR', false, 6, null); $this->addColumn('live_stream_using_airtime_auth', 'DbLiveStreamUsingAirtimeAuth', 'BOOLEAN', false, null, false); diff --git a/airtime_mvc/application/models/airtime/map/CeleryTasksTableMap.php b/airtime_mvc/application/models/airtime/map/CeleryTasksTableMap.php new file mode 100644 index 000000000..042cee8d8 --- /dev/null +++ b/airtime_mvc/application/models/airtime/map/CeleryTasksTableMap.php @@ -0,0 +1,59 @@ +setName('celery_tasks'); + $this->setPhpName('CeleryTasks'); + $this->setClassname('CeleryTasks'); + $this->setPackage('airtime'); + $this->setUseIdGenerator(true); + $this->setPrimaryKeyMethodInfo('celery_tasks_id_seq'); + // columns + $this->addPrimaryKey('id', 'DbId', 'INTEGER', true, null, null); + $this->addColumn('task_id', 'DbTaskId', 'VARCHAR', true, 256, null); + $this->addForeignKey('track_reference', 'DbTrackReference', 'INTEGER', 'third_party_track_references', 'id', true, null, null); + $this->addColumn('name', 'DbName', 'VARCHAR', false, 256, null); + $this->addColumn('dispatch_time', 'DbDispatchTime', 'TIMESTAMP', false, null, null); + $this->addColumn('status', 'DbStatus', 'VARCHAR', true, 256, null); + // validators + } // initialize() + + /** + * Build the RelationMap objects for this table relationships + */ + public function buildRelations() + { + $this->addRelation('ThirdPartyTrackReferences', 'ThirdPartyTrackReferences', RelationMap::MANY_TO_ONE, array('track_reference' => 'id', ), 'CASCADE', null); + } // buildRelations() + +} // CeleryTasksTableMap diff --git a/airtime_mvc/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php b/airtime_mvc/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php new file mode 100644 index 000000000..98b907c19 --- /dev/null +++ b/airtime_mvc/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php @@ -0,0 +1,60 @@ +setName('third_party_track_references'); + $this->setPhpName('ThirdPartyTrackReferences'); + $this->setClassname('ThirdPartyTrackReferences'); + $this->setPackage('airtime'); + $this->setUseIdGenerator(true); + $this->setPrimaryKeyMethodInfo('third_party_track_references_id_seq'); + // columns + $this->addPrimaryKey('id', 'DbId', 'INTEGER', true, null, null); + $this->addColumn('service', 'DbService', 'VARCHAR', true, 256, null); + $this->addColumn('foreign_id', 'DbForeignId', 'VARCHAR', false, 256, null); + $this->addForeignKey('file_id', 'DbFileId', 'INTEGER', 'cc_files', 'id', true, null, null); + $this->addColumn('upload_time', 'DbUploadTime', 'TIMESTAMP', false, null, null); + $this->addColumn('status', 'DbStatus', 'VARCHAR', false, 256, null); + // validators + } // initialize() + + /** + * Build the RelationMap objects for this table relationships + */ + public function buildRelations() + { + $this->addRelation('CcFiles', 'CcFiles', RelationMap::MANY_TO_ONE, array('file_id' => 'id', ), 'CASCADE', null); + $this->addRelation('CeleryTasks', 'CeleryTasks', RelationMap::ONE_TO_MANY, array('id' => 'track_reference', ), 'CASCADE', null, 'CeleryTaskss'); + } // buildRelations() + +} // ThirdPartyTrackReferencesTableMap diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php index ef2d942dc..faa0964c0 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFiles.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFiles.php @@ -521,6 +521,12 @@ abstract class BaseCcFiles extends BaseObject implements Persistent protected $collCcPlayoutHistorys; protected $collCcPlayoutHistorysPartial; + /** + * @var PropelObjectCollection|ThirdPartyTrackReferences[] Collection to store aggregation of ThirdPartyTrackReferences objects. + */ + protected $collThirdPartyTrackReferencess; + protected $collThirdPartyTrackReferencessPartial; + /** * Flag to prevent endless save loop, if this object is referenced * by another object which falls in this transaction. @@ -577,6 +583,12 @@ abstract class BaseCcFiles extends BaseObject implements Persistent */ protected $ccPlayoutHistorysScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var PropelObjectCollection + */ + protected $thirdPartyTrackReferencessScheduledForDeletion = null; + /** * Applies default values to this object. * This method should be called from the object's constructor (or @@ -3298,6 +3310,8 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->collCcPlayoutHistorys = null; + $this->collThirdPartyTrackReferencess = null; + } // if (deep) } @@ -3550,6 +3564,23 @@ abstract class BaseCcFiles extends BaseObject implements Persistent } } + if ($this->thirdPartyTrackReferencessScheduledForDeletion !== null) { + if (!$this->thirdPartyTrackReferencessScheduledForDeletion->isEmpty()) { + ThirdPartyTrackReferencesQuery::create() + ->filterByPrimaryKeys($this->thirdPartyTrackReferencessScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->thirdPartyTrackReferencessScheduledForDeletion = null; + } + } + + if ($this->collThirdPartyTrackReferencess !== null) { + foreach ($this->collThirdPartyTrackReferencess as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + $this->alreadyInSave = false; } @@ -4187,6 +4218,14 @@ abstract class BaseCcFiles extends BaseObject implements Persistent } } + if ($this->collThirdPartyTrackReferencess !== null) { + foreach ($this->collThirdPartyTrackReferencess as $referrerFK) { + if (!$referrerFK->validate($columns)) { + $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); + } + } + } + $this->alreadyInValidation = false; } @@ -4569,6 +4608,9 @@ abstract class BaseCcFiles extends BaseObject implements Persistent if (null !== $this->collCcPlayoutHistorys) { $result['CcPlayoutHistorys'] = $this->collCcPlayoutHistorys->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collThirdPartyTrackReferencess) { + $result['ThirdPartyTrackReferencess'] = $this->collThirdPartyTrackReferencess->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } } return $result; @@ -5170,6 +5212,12 @@ abstract class BaseCcFiles extends BaseObject implements Persistent } } + foreach ($this->getThirdPartyTrackReferencess() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addThirdPartyTrackReferences($relObj->copy($deepCopy)); + } + } + //unflag object copy $this->startCopy = false; } // if ($deepCopy) @@ -5405,6 +5453,9 @@ abstract class BaseCcFiles extends BaseObject implements Persistent if ('CcPlayoutHistory' == $relationName) { $this->initCcPlayoutHistorys(); } + if ('ThirdPartyTrackReferences' == $relationName) { + $this->initThirdPartyTrackReferencess(); + } } /** @@ -6957,6 +7008,231 @@ abstract class BaseCcFiles extends BaseObject implements Persistent return $this->getCcPlayoutHistorys($query, $con); } + /** + * Clears out the collThirdPartyTrackReferencess collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return CcFiles The current object (for fluent API support) + * @see addThirdPartyTrackReferencess() + */ + public function clearThirdPartyTrackReferencess() + { + $this->collThirdPartyTrackReferencess = null; // important to set this to null since that means it is uninitialized + $this->collThirdPartyTrackReferencessPartial = null; + + return $this; + } + + /** + * reset is the collThirdPartyTrackReferencess collection loaded partially + * + * @return void + */ + public function resetPartialThirdPartyTrackReferencess($v = true) + { + $this->collThirdPartyTrackReferencessPartial = $v; + } + + /** + * Initializes the collThirdPartyTrackReferencess collection. + * + * By default this just sets the collThirdPartyTrackReferencess collection to an empty array (like clearcollThirdPartyTrackReferencess()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initThirdPartyTrackReferencess($overrideExisting = true) + { + if (null !== $this->collThirdPartyTrackReferencess && !$overrideExisting) { + return; + } + $this->collThirdPartyTrackReferencess = new PropelObjectCollection(); + $this->collThirdPartyTrackReferencess->setModel('ThirdPartyTrackReferences'); + } + + /** + * Gets an array of ThirdPartyTrackReferences objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this CcFiles is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param PropelPDO $con optional connection object + * @return PropelObjectCollection|ThirdPartyTrackReferences[] List of ThirdPartyTrackReferences objects + * @throws PropelException + */ + public function getThirdPartyTrackReferencess($criteria = null, PropelPDO $con = null) + { + $partial = $this->collThirdPartyTrackReferencessPartial && !$this->isNew(); + if (null === $this->collThirdPartyTrackReferencess || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collThirdPartyTrackReferencess) { + // return empty collection + $this->initThirdPartyTrackReferencess(); + } else { + $collThirdPartyTrackReferencess = ThirdPartyTrackReferencesQuery::create(null, $criteria) + ->filterByCcFiles($this) + ->find($con); + if (null !== $criteria) { + if (false !== $this->collThirdPartyTrackReferencessPartial && count($collThirdPartyTrackReferencess)) { + $this->initThirdPartyTrackReferencess(false); + + foreach ($collThirdPartyTrackReferencess as $obj) { + if (false == $this->collThirdPartyTrackReferencess->contains($obj)) { + $this->collThirdPartyTrackReferencess->append($obj); + } + } + + $this->collThirdPartyTrackReferencessPartial = true; + } + + $collThirdPartyTrackReferencess->getInternalIterator()->rewind(); + + return $collThirdPartyTrackReferencess; + } + + if ($partial && $this->collThirdPartyTrackReferencess) { + foreach ($this->collThirdPartyTrackReferencess as $obj) { + if ($obj->isNew()) { + $collThirdPartyTrackReferencess[] = $obj; + } + } + } + + $this->collThirdPartyTrackReferencess = $collThirdPartyTrackReferencess; + $this->collThirdPartyTrackReferencessPartial = false; + } + } + + return $this->collThirdPartyTrackReferencess; + } + + /** + * Sets a collection of ThirdPartyTrackReferences objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param PropelCollection $thirdPartyTrackReferencess A Propel collection. + * @param PropelPDO $con Optional connection object + * @return CcFiles The current object (for fluent API support) + */ + public function setThirdPartyTrackReferencess(PropelCollection $thirdPartyTrackReferencess, PropelPDO $con = null) + { + $thirdPartyTrackReferencessToDelete = $this->getThirdPartyTrackReferencess(new Criteria(), $con)->diff($thirdPartyTrackReferencess); + + + $this->thirdPartyTrackReferencessScheduledForDeletion = $thirdPartyTrackReferencessToDelete; + + foreach ($thirdPartyTrackReferencessToDelete as $thirdPartyTrackReferencesRemoved) { + $thirdPartyTrackReferencesRemoved->setCcFiles(null); + } + + $this->collThirdPartyTrackReferencess = null; + foreach ($thirdPartyTrackReferencess as $thirdPartyTrackReferences) { + $this->addThirdPartyTrackReferences($thirdPartyTrackReferences); + } + + $this->collThirdPartyTrackReferencess = $thirdPartyTrackReferencess; + $this->collThirdPartyTrackReferencessPartial = false; + + return $this; + } + + /** + * Returns the number of related ThirdPartyTrackReferences objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param PropelPDO $con + * @return int Count of related ThirdPartyTrackReferences objects. + * @throws PropelException + */ + public function countThirdPartyTrackReferencess(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + { + $partial = $this->collThirdPartyTrackReferencessPartial && !$this->isNew(); + if (null === $this->collThirdPartyTrackReferencess || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collThirdPartyTrackReferencess) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getThirdPartyTrackReferencess()); + } + $query = ThirdPartyTrackReferencesQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByCcFiles($this) + ->count($con); + } + + return count($this->collThirdPartyTrackReferencess); + } + + /** + * Method called to associate a ThirdPartyTrackReferences object to this object + * through the ThirdPartyTrackReferences foreign key attribute. + * + * @param ThirdPartyTrackReferences $l ThirdPartyTrackReferences + * @return CcFiles The current object (for fluent API support) + */ + public function addThirdPartyTrackReferences(ThirdPartyTrackReferences $l) + { + if ($this->collThirdPartyTrackReferencess === null) { + $this->initThirdPartyTrackReferencess(); + $this->collThirdPartyTrackReferencessPartial = true; + } + + if (!in_array($l, $this->collThirdPartyTrackReferencess->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddThirdPartyTrackReferences($l); + + if ($this->thirdPartyTrackReferencessScheduledForDeletion and $this->thirdPartyTrackReferencessScheduledForDeletion->contains($l)) { + $this->thirdPartyTrackReferencessScheduledForDeletion->remove($this->thirdPartyTrackReferencessScheduledForDeletion->search($l)); + } + } + + return $this; + } + + /** + * @param ThirdPartyTrackReferences $thirdPartyTrackReferences The thirdPartyTrackReferences object to add. + */ + protected function doAddThirdPartyTrackReferences($thirdPartyTrackReferences) + { + $this->collThirdPartyTrackReferencess[]= $thirdPartyTrackReferences; + $thirdPartyTrackReferences->setCcFiles($this); + } + + /** + * @param ThirdPartyTrackReferences $thirdPartyTrackReferences The thirdPartyTrackReferences object to remove. + * @return CcFiles The current object (for fluent API support) + */ + public function removeThirdPartyTrackReferences($thirdPartyTrackReferences) + { + if ($this->getThirdPartyTrackReferencess()->contains($thirdPartyTrackReferences)) { + $this->collThirdPartyTrackReferencess->remove($this->collThirdPartyTrackReferencess->search($thirdPartyTrackReferences)); + if (null === $this->thirdPartyTrackReferencessScheduledForDeletion) { + $this->thirdPartyTrackReferencessScheduledForDeletion = clone $this->collThirdPartyTrackReferencess; + $this->thirdPartyTrackReferencessScheduledForDeletion->clear(); + } + $this->thirdPartyTrackReferencessScheduledForDeletion[]= clone $thirdPartyTrackReferences; + $thirdPartyTrackReferences->setCcFiles(null); + } + + return $this; + } + /** * Clears the current object and sets all attributes to their default values */ @@ -7086,6 +7362,11 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $o->clearAllReferences($deep); } } + if ($this->collThirdPartyTrackReferencess) { + foreach ($this->collThirdPartyTrackReferencess as $o) { + $o->clearAllReferences($deep); + } + } if ($this->aFkOwner instanceof Persistent) { $this->aFkOwner->clearAllReferences($deep); } @@ -7123,6 +7404,10 @@ abstract class BaseCcFiles extends BaseObject implements Persistent $this->collCcPlayoutHistorys->clearIterator(); } $this->collCcPlayoutHistorys = null; + if ($this->collThirdPartyTrackReferencess instanceof PropelCollection) { + $this->collThirdPartyTrackReferencess->clearIterator(); + } + $this->collThirdPartyTrackReferencess = null; $this->aFkOwner = null; $this->aCcSubjsRelatedByDbEditedby = null; $this->aCcMusicDirs = null; diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php index c6928a0d2..cbe44f498 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesPeer.php @@ -723,6 +723,9 @@ abstract class BaseCcFilesPeer // Invalidate objects in CcPlayoutHistoryPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcPlayoutHistoryPeer::clearInstancePool(); + // Invalidate objects in ThirdPartyTrackReferencesPeer instance pool, + // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. + ThirdPartyTrackReferencesPeer::clearInstancePool(); } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php index 01357b305..1ed4e004f 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcFilesQuery.php @@ -190,6 +190,10 @@ * @method CcFilesQuery rightJoinCcPlayoutHistory($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CcPlayoutHistory relation * @method CcFilesQuery innerJoinCcPlayoutHistory($relationAlias = null) Adds a INNER JOIN clause to the query using the CcPlayoutHistory relation * + * @method CcFilesQuery leftJoinThirdPartyTrackReferences($relationAlias = null) Adds a LEFT JOIN clause to the query using the ThirdPartyTrackReferences relation + * @method CcFilesQuery rightJoinThirdPartyTrackReferences($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ThirdPartyTrackReferences relation + * @method CcFilesQuery innerJoinThirdPartyTrackReferences($relationAlias = null) Adds a INNER JOIN clause to the query using the ThirdPartyTrackReferences relation + * * @method CcFiles findOne(PropelPDO $con = null) Return the first CcFiles matching the query * @method CcFiles findOneOrCreate(PropelPDO $con = null) Return the first CcFiles matching the query, or a new CcFiles object populated from the query conditions when no match is found * @@ -3509,6 +3513,80 @@ abstract class BaseCcFilesQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'CcPlayoutHistory', 'CcPlayoutHistoryQuery'); } + /** + * Filter the query by a related ThirdPartyTrackReferences object + * + * @param ThirdPartyTrackReferences|PropelObjectCollection $thirdPartyTrackReferences the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CcFilesQuery The current query, for fluid interface + * @throws PropelException - if the provided filter is invalid. + */ + public function filterByThirdPartyTrackReferences($thirdPartyTrackReferences, $comparison = null) + { + if ($thirdPartyTrackReferences instanceof ThirdPartyTrackReferences) { + return $this + ->addUsingAlias(CcFilesPeer::ID, $thirdPartyTrackReferences->getDbFileId(), $comparison); + } elseif ($thirdPartyTrackReferences instanceof PropelObjectCollection) { + return $this + ->useThirdPartyTrackReferencesQuery() + ->filterByPrimaryKeys($thirdPartyTrackReferences->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByThirdPartyTrackReferences() only accepts arguments of type ThirdPartyTrackReferences or PropelCollection'); + } + } + + /** + * Adds a JOIN clause to the query using the ThirdPartyTrackReferences relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return CcFilesQuery The current query, for fluid interface + */ + public function joinThirdPartyTrackReferences($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('ThirdPartyTrackReferences'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'ThirdPartyTrackReferences'); + } + + return $this; + } + + /** + * Use the ThirdPartyTrackReferences relation ThirdPartyTrackReferences object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ThirdPartyTrackReferencesQuery A secondary query class using the current class as primary query + */ + public function useThirdPartyTrackReferencesQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinThirdPartyTrackReferences($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'ThirdPartyTrackReferences', 'ThirdPartyTrackReferencesQuery'); + } + /** * Exclude object from result * diff --git a/airtime_mvc/application/models/airtime/om/BaseCeleryTasks.php b/airtime_mvc/application/models/airtime/om/BaseCeleryTasks.php new file mode 100644 index 000000000..70879be46 --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseCeleryTasks.php @@ -0,0 +1,1189 @@ +id; + } + + /** + * Get the [task_id] column value. + * + * @return string + */ + public function getDbTaskId() + { + + return $this->task_id; + } + + /** + * Get the [track_reference] column value. + * + * @return int + */ + public function getDbTrackReference() + { + + return $this->track_reference; + } + + /** + * Get the [name] column value. + * + * @return string + */ + public function getDbName() + { + + return $this->name; + } + + /** + * Get the [optionally formatted] temporal [dispatch_time] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is null, then the raw DateTime object will be returned. + * @return mixed Formatted date/time value as string or DateTime object (if format is null), null if column is null + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getDbDispatchTime($format = 'Y-m-d H:i:s') + { + if ($this->dispatch_time === null) { + return null; + } + + + try { + $dt = new DateTime($this->dispatch_time); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->dispatch_time, true), $x); + } + + if ($format === null) { + // Because propel.useDateTimeClass is true, we return a DateTime object. + return $dt; + } + + if (strpos($format, '%') !== false) { + return strftime($format, $dt->format('U')); + } + + return $dt->format($format); + + } + + /** + * Get the [status] column value. + * + * @return string + */ + public function getDbStatus() + { + + return $this->status; + } + + /** + * Set the value of [id] column. + * + * @param int $v new value + * @return CeleryTasks The current object (for fluent API support) + */ + public function setDbId($v) + { + if ($v !== null && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = CeleryTasksPeer::ID; + } + + + return $this; + } // setDbId() + + /** + * Set the value of [task_id] column. + * + * @param string $v new value + * @return CeleryTasks The current object (for fluent API support) + */ + public function setDbTaskId($v) + { + if ($v !== null && is_numeric($v)) { + $v = (string) $v; + } + + if ($this->task_id !== $v) { + $this->task_id = $v; + $this->modifiedColumns[] = CeleryTasksPeer::TASK_ID; + } + + + return $this; + } // setDbTaskId() + + /** + * Set the value of [track_reference] column. + * + * @param int $v new value + * @return CeleryTasks The current object (for fluent API support) + */ + public function setDbTrackReference($v) + { + if ($v !== null && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->track_reference !== $v) { + $this->track_reference = $v; + $this->modifiedColumns[] = CeleryTasksPeer::TRACK_REFERENCE; + } + + if ($this->aThirdPartyTrackReferences !== null && $this->aThirdPartyTrackReferences->getDbId() !== $v) { + $this->aThirdPartyTrackReferences = null; + } + + + return $this; + } // setDbTrackReference() + + /** + * Set the value of [name] column. + * + * @param string $v new value + * @return CeleryTasks The current object (for fluent API support) + */ + public function setDbName($v) + { + if ($v !== null && is_numeric($v)) { + $v = (string) $v; + } + + if ($this->name !== $v) { + $this->name = $v; + $this->modifiedColumns[] = CeleryTasksPeer::NAME; + } + + + return $this; + } // setDbName() + + /** + * Sets the value of [dispatch_time] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or DateTime value. + * Empty strings are treated as null. + * @return CeleryTasks The current object (for fluent API support) + */ + public function setDbDispatchTime($v) + { + $dt = PropelDateTime::newInstance($v, null, 'DateTime'); + if ($this->dispatch_time !== null || $dt !== null) { + $currentDateAsString = ($this->dispatch_time !== null && $tmpDt = new DateTime($this->dispatch_time)) ? $tmpDt->format('Y-m-d H:i:s') : null; + $newDateAsString = $dt ? $dt->format('Y-m-d H:i:s') : null; + if ($currentDateAsString !== $newDateAsString) { + $this->dispatch_time = $newDateAsString; + $this->modifiedColumns[] = CeleryTasksPeer::DISPATCH_TIME; + } + } // if either are not null + + + return $this; + } // setDbDispatchTime() + + /** + * Set the value of [status] column. + * + * @param string $v new value + * @return CeleryTasks The current object (for fluent API support) + */ + public function setDbStatus($v) + { + if ($v !== null && is_numeric($v)) { + $v = (string) $v; + } + + if ($this->status !== $v) { + $this->status = $v; + $this->modifiedColumns[] = CeleryTasksPeer::STATUS; + } + + + return $this; + } // setDbStatus() + + /** + * Indicates whether the columns in this object are only set to default values. + * + * This method can be used in conjunction with isModified() to indicate whether an object is both + * modified _and_ has some values set which are non-default. + * + * @return boolean Whether the columns in this object are only been set with default values. + */ + public function hasOnlyDefaultValues() + { + // otherwise, everything was equal, so return true + return true; + } // hasOnlyDefaultValues() + + /** + * Hydrates (populates) the object variables with values from the database resultset. + * + * An offset (0-based "start column") is specified so that objects can be hydrated + * with a subset of the columns in the resultset rows. This is needed, for example, + * for results of JOIN queries where the resultset row includes columns from two or + * more tables. + * + * @param array $row The row returned by PDOStatement->fetch(PDO::FETCH_NUM) + * @param int $startcol 0-based offset column which indicates which resultset column to start with. + * @param boolean $rehydrate Whether this object is being re-hydrated from the database. + * @return int next starting column + * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. + */ + public function hydrate($row, $startcol = 0, $rehydrate = false) + { + try { + + $this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null; + $this->task_id = ($row[$startcol + 1] !== null) ? (string) $row[$startcol + 1] : null; + $this->track_reference = ($row[$startcol + 2] !== null) ? (int) $row[$startcol + 2] : null; + $this->name = ($row[$startcol + 3] !== null) ? (string) $row[$startcol + 3] : null; + $this->dispatch_time = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null; + $this->status = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null; + $this->resetModified(); + + $this->setNew(false); + + if ($rehydrate) { + $this->ensureConsistency(); + } + $this->postHydrate($row, $startcol, $rehydrate); + + return $startcol + 6; // 6 = CeleryTasksPeer::NUM_HYDRATE_COLUMNS. + + } catch (Exception $e) { + throw new PropelException("Error populating CeleryTasks object", $e); + } + } + + /** + * Checks and repairs the internal consistency of the object. + * + * This method is executed after an already-instantiated object is re-hydrated + * from the database. It exists to check any foreign keys to make sure that + * the objects related to the current object are correct based on foreign key. + * + * You can override this method in the stub class, but you should always invoke + * the base method from the overridden method (i.e. parent::ensureConsistency()), + * in case your model changes. + * + * @throws PropelException + */ + public function ensureConsistency() + { + + if ($this->aThirdPartyTrackReferences !== null && $this->track_reference !== $this->aThirdPartyTrackReferences->getDbId()) { + $this->aThirdPartyTrackReferences = null; + } + } // ensureConsistency + + /** + * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. + * + * This will only work if the object has been saved and has a valid primary key set. + * + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param PropelPDO $con (optional) The PropelPDO connection to use. + * @return void + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + */ + public function reload($deep = false, PropelPDO $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("Cannot reload a deleted object."); + } + + if ($this->isNew()) { + throw new PropelException("Cannot reload an unsaved object."); + } + + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + // We don't need to alter the object instance pool; we're just modifying this instance + // already in the pool. + + $stmt = CeleryTasksPeer::doSelectStmt($this->buildPkeyCriteria(), $con); + $row = $stmt->fetch(PDO::FETCH_NUM); + $stmt->closeCursor(); + if (!$row) { + throw new PropelException('Cannot find matching row in the database to reload object values.'); + } + $this->hydrate($row, 0, true); // rehydrate + + if ($deep) { // also de-associate any related objects? + + $this->aThirdPartyTrackReferences = null; + } // if (deep) + } + + /** + * Removes this object from datastore and sets delete attribute. + * + * @param PropelPDO $con + * @return void + * @throws PropelException + * @throws Exception + * @see BaseObject::setDeleted() + * @see BaseObject::isDeleted() + */ + public function delete(PropelPDO $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + $con->beginTransaction(); + try { + $deleteQuery = CeleryTasksQuery::create() + ->filterByPrimaryKey($this->getPrimaryKey()); + $ret = $this->preDelete($con); + if ($ret) { + $deleteQuery->delete($con); + $this->postDelete($con); + $con->commit(); + $this->setDeleted(true); + } else { + $con->commit(); + } + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Persists this object to the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All modified related objects will also be persisted in the doSave() + * method. This method wraps all precipitate database operations in a + * single transaction. + * + * @param PropelPDO $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @throws Exception + * @see doSave() + */ + public function save(PropelPDO $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + $con->beginTransaction(); + $isInsert = $this->isNew(); + try { + $ret = $this->preSave($con); + if ($isInsert) { + $ret = $ret && $this->preInsert($con); + } else { + $ret = $ret && $this->preUpdate($con); + } + if ($ret) { + $affectedRows = $this->doSave($con); + if ($isInsert) { + $this->postInsert($con); + } else { + $this->postUpdate($con); + } + $this->postSave($con); + CeleryTasksPeer::addInstanceToPool($this); + } else { + $affectedRows = 0; + } + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs the work of inserting or updating the row in the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All related objects are also updated in this method. + * + * @param PropelPDO $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see save() + */ + protected function doSave(PropelPDO $con) + { + $affectedRows = 0; // initialize var to track total num of affected rows + if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + // We call the save method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aThirdPartyTrackReferences !== null) { + if ($this->aThirdPartyTrackReferences->isModified() || $this->aThirdPartyTrackReferences->isNew()) { + $affectedRows += $this->aThirdPartyTrackReferences->save($con); + } + $this->setThirdPartyTrackReferences($this->aThirdPartyTrackReferences); + } + + if ($this->isNew() || $this->isModified()) { + // persist changes + if ($this->isNew()) { + $this->doInsert($con); + } else { + $this->doUpdate($con); + } + $affectedRows += 1; + $this->resetModified(); + } + + $this->alreadyInSave = false; + + } + + return $affectedRows; + } // doSave() + + /** + * Insert the row in the database. + * + * @param PropelPDO $con + * + * @throws PropelException + * @see doSave() + */ + protected function doInsert(PropelPDO $con) + { + $modifiedColumns = array(); + $index = 0; + + $this->modifiedColumns[] = CeleryTasksPeer::ID; + if (null !== $this->id) { + throw new PropelException('Cannot insert a value for auto-increment primary key (' . CeleryTasksPeer::ID . ')'); + } + if (null === $this->id) { + try { + $stmt = $con->query("SELECT nextval('celery_tasks_id_seq')"); + $row = $stmt->fetch(PDO::FETCH_NUM); + $this->id = $row[0]; + } catch (Exception $e) { + throw new PropelException('Unable to get sequence id.', $e); + } + } + + + // check the columns in natural order for more readable SQL queries + if ($this->isColumnModified(CeleryTasksPeer::ID)) { + $modifiedColumns[':p' . $index++] = '"id"'; + } + if ($this->isColumnModified(CeleryTasksPeer::TASK_ID)) { + $modifiedColumns[':p' . $index++] = '"task_id"'; + } + if ($this->isColumnModified(CeleryTasksPeer::TRACK_REFERENCE)) { + $modifiedColumns[':p' . $index++] = '"track_reference"'; + } + if ($this->isColumnModified(CeleryTasksPeer::NAME)) { + $modifiedColumns[':p' . $index++] = '"name"'; + } + if ($this->isColumnModified(CeleryTasksPeer::DISPATCH_TIME)) { + $modifiedColumns[':p' . $index++] = '"dispatch_time"'; + } + if ($this->isColumnModified(CeleryTasksPeer::STATUS)) { + $modifiedColumns[':p' . $index++] = '"status"'; + } + + $sql = sprintf( + 'INSERT INTO "celery_tasks" (%s) VALUES (%s)', + implode(', ', $modifiedColumns), + implode(', ', array_keys($modifiedColumns)) + ); + + try { + $stmt = $con->prepare($sql); + foreach ($modifiedColumns as $identifier => $columnName) { + switch ($columnName) { + case '"id"': + $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; + case '"task_id"': + $stmt->bindValue($identifier, $this->task_id, PDO::PARAM_STR); + break; + case '"track_reference"': + $stmt->bindValue($identifier, $this->track_reference, PDO::PARAM_INT); + break; + case '"name"': + $stmt->bindValue($identifier, $this->name, PDO::PARAM_STR); + break; + case '"dispatch_time"': + $stmt->bindValue($identifier, $this->dispatch_time, PDO::PARAM_STR); + break; + case '"status"': + $stmt->bindValue($identifier, $this->status, PDO::PARAM_STR); + break; + } + } + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), $e); + } + + $this->setNew(false); + } + + /** + * Update the row in the database. + * + * @param PropelPDO $con + * + * @see doSave() + */ + protected function doUpdate(PropelPDO $con) + { + $selectCriteria = $this->buildPkeyCriteria(); + $valuesCriteria = $this->buildCriteria(); + BasePeer::doUpdate($selectCriteria, $valuesCriteria, $con); + } + + /** + * Array of ValidationFailed objects. + * @var array ValidationFailed[] + */ + protected $validationFailures = array(); + + /** + * Gets any ValidationFailed objects that resulted from last call to validate(). + * + * + * @return array ValidationFailed[] + * @see validate() + */ + public function getValidationFailures() + { + return $this->validationFailures; + } + + /** + * Validates the objects modified field values and all objects related to this table. + * + * If $columns is either a column name or an array of column names + * only those columns are validated. + * + * @param mixed $columns Column name or an array of column names. + * @return boolean Whether all columns pass validation. + * @see doValidate() + * @see getValidationFailures() + */ + public function validate($columns = null) + { + $res = $this->doValidate($columns); + if ($res === true) { + $this->validationFailures = array(); + + return true; + } + + $this->validationFailures = $res; + + return false; + } + + /** + * This function performs the validation work for complex object models. + * + * In addition to checking the current object, all related objects will + * also be validated. If all pass then true is returned; otherwise + * an aggregated array of ValidationFailed objects will be returned. + * + * @param array $columns Array of column names to validate. + * @return mixed true if all validations pass; array of ValidationFailed objects otherwise. + */ + protected function doValidate($columns = null) + { + if (!$this->alreadyInValidation) { + $this->alreadyInValidation = true; + $retval = null; + + $failureMap = array(); + + + // We call the validate method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aThirdPartyTrackReferences !== null) { + if (!$this->aThirdPartyTrackReferences->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aThirdPartyTrackReferences->getValidationFailures()); + } + } + + + if (($retval = CeleryTasksPeer::doValidate($this, $columns)) !== true) { + $failureMap = array_merge($failureMap, $retval); + } + + + + $this->alreadyInValidation = false; + } + + return (!empty($failureMap) ? $failureMap : true); + } + + /** + * Retrieves a field from the object by name passed in as a string. + * + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * Defaults to BasePeer::TYPE_PHPNAME + * @return mixed Value of field. + */ + public function getByName($name, $type = BasePeer::TYPE_PHPNAME) + { + $pos = CeleryTasksPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + $field = $this->getByPosition($pos); + + return $field; + } + + /** + * Retrieves a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @return mixed Value of field at $pos + */ + public function getByPosition($pos) + { + switch ($pos) { + case 0: + return $this->getDbId(); + break; + case 1: + return $this->getDbTaskId(); + break; + case 2: + return $this->getDbTrackReference(); + break; + case 3: + return $this->getDbName(); + break; + case 4: + return $this->getDbDispatchTime(); + break; + case 5: + return $this->getDbStatus(); + break; + default: + return null; + break; + } // switch() + } + + /** + * Exports the object as an array. + * + * You can specify the key type of the array by passing one of the class + * type constants. + * + * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * Defaults to BasePeer::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to true. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * + * @return array an associative array containing the field names (as keys) and field values + */ + public function toArray($keyType = BasePeer::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) + { + if (isset($alreadyDumpedObjects['CeleryTasks'][$this->getPrimaryKey()])) { + return '*RECURSION*'; + } + $alreadyDumpedObjects['CeleryTasks'][$this->getPrimaryKey()] = true; + $keys = CeleryTasksPeer::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getDbId(), + $keys[1] => $this->getDbTaskId(), + $keys[2] => $this->getDbTrackReference(), + $keys[3] => $this->getDbName(), + $keys[4] => $this->getDbDispatchTime(), + $keys[5] => $this->getDbStatus(), + ); + $virtualColumns = $this->virtualColumns; + foreach ($virtualColumns as $key => $virtualColumn) { + $result[$key] = $virtualColumn; + } + + if ($includeForeignObjects) { + if (null !== $this->aThirdPartyTrackReferences) { + $result['ThirdPartyTrackReferences'] = $this->aThirdPartyTrackReferences->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + } + + return $result; + } + + /** + * Sets a field from the object by name passed in as a string. + * + * @param string $name peer name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * Defaults to BasePeer::TYPE_PHPNAME + * @return void + */ + public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME) + { + $pos = CeleryTasksPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + + $this->setByPosition($pos, $value); + } + + /** + * Sets a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @param mixed $value field value + * @return void + */ + public function setByPosition($pos, $value) + { + switch ($pos) { + case 0: + $this->setDbId($value); + break; + case 1: + $this->setDbTaskId($value); + break; + case 2: + $this->setDbTrackReference($value); + break; + case 3: + $this->setDbName($value); + break; + case 4: + $this->setDbDispatchTime($value); + break; + case 5: + $this->setDbStatus($value); + break; + } // switch() + } + + /** + * Populates the object using an array. + * + * This is particularly useful when populating an object from one of the + * request arrays (e.g. $_POST). This method goes through the column + * names, checking to see whether a matching key exists in populated + * array. If so the setByName() method is called for that column. + * + * You can specify the key type of the array by additionally passing one + * of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * The default key type is the column's BasePeer::TYPE_PHPNAME + * + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. + * @return void + */ + public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME) + { + $keys = CeleryTasksPeer::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setDbTaskId($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setDbTrackReference($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setDbName($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setDbDispatchTime($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setDbStatus($arr[$keys[5]]); + } + + /** + * Build a Criteria object containing the values of all modified columns in this object. + * + * @return Criteria The Criteria object containing all modified values. + */ + public function buildCriteria() + { + $criteria = new Criteria(CeleryTasksPeer::DATABASE_NAME); + + if ($this->isColumnModified(CeleryTasksPeer::ID)) $criteria->add(CeleryTasksPeer::ID, $this->id); + if ($this->isColumnModified(CeleryTasksPeer::TASK_ID)) $criteria->add(CeleryTasksPeer::TASK_ID, $this->task_id); + if ($this->isColumnModified(CeleryTasksPeer::TRACK_REFERENCE)) $criteria->add(CeleryTasksPeer::TRACK_REFERENCE, $this->track_reference); + if ($this->isColumnModified(CeleryTasksPeer::NAME)) $criteria->add(CeleryTasksPeer::NAME, $this->name); + if ($this->isColumnModified(CeleryTasksPeer::DISPATCH_TIME)) $criteria->add(CeleryTasksPeer::DISPATCH_TIME, $this->dispatch_time); + if ($this->isColumnModified(CeleryTasksPeer::STATUS)) $criteria->add(CeleryTasksPeer::STATUS, $this->status); + + return $criteria; + } + + /** + * Builds a Criteria object containing the primary key for this object. + * + * Unlike buildCriteria() this method includes the primary key values regardless + * of whether or not they have been modified. + * + * @return Criteria The Criteria object containing value(s) for primary key(s). + */ + public function buildPkeyCriteria() + { + $criteria = new Criteria(CeleryTasksPeer::DATABASE_NAME); + $criteria->add(CeleryTasksPeer::ID, $this->id); + + return $criteria; + } + + /** + * Returns the primary key for this object (row). + * @return int + */ + public function getPrimaryKey() + { + return $this->getDbId(); + } + + /** + * Generic method to set the primary key (id column). + * + * @param int $key Primary key. + * @return void + */ + public function setPrimaryKey($key) + { + $this->setDbId($key); + } + + /** + * Returns true if the primary key for this object is null. + * @return boolean + */ + public function isPrimaryKeyNull() + { + + return null === $this->getDbId(); + } + + /** + * Sets contents of passed object to values from current object. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param object $copyObj An object of CeleryTasks (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @throws PropelException + */ + public function copyInto($copyObj, $deepCopy = false, $makeNew = true) + { + $copyObj->setDbTaskId($this->getDbTaskId()); + $copyObj->setDbTrackReference($this->getDbTrackReference()); + $copyObj->setDbName($this->getDbName()); + $copyObj->setDbDispatchTime($this->getDbDispatchTime()); + $copyObj->setDbStatus($this->getDbStatus()); + + if ($deepCopy && !$this->startCopy) { + // important: temporarily setNew(false) because this affects the behavior of + // the getter/setter methods for fkey referrer objects. + $copyObj->setNew(false); + // store object hash to prevent cycle + $this->startCopy = true; + + //unflag object copy + $this->startCopy = false; + } // if ($deepCopy) + + if ($makeNew) { + $copyObj->setNew(true); + $copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value + } + } + + /** + * Makes a copy of this object that will be inserted as a new row in table when saved. + * It creates a new object filling in the simple attributes, but skipping any primary + * keys that are defined for the table. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return CeleryTasks Clone of current object. + * @throws PropelException + */ + public function copy($deepCopy = false) + { + // we use get_class(), because this might be a subclass + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + + return $copyObj; + } + + /** + * Returns a peer instance associated with this om. + * + * Since Peer classes are not to have any instance attributes, this method returns the + * same instance for all member of this class. The method could therefore + * be static, but this would prevent one from overriding the behavior. + * + * @return CeleryTasksPeer + */ + public function getPeer() + { + if (self::$peer === null) { + self::$peer = new CeleryTasksPeer(); + } + + return self::$peer; + } + + /** + * Declares an association between this object and a ThirdPartyTrackReferences object. + * + * @param ThirdPartyTrackReferences $v + * @return CeleryTasks The current object (for fluent API support) + * @throws PropelException + */ + public function setThirdPartyTrackReferences(ThirdPartyTrackReferences $v = null) + { + if ($v === null) { + $this->setDbTrackReference(NULL); + } else { + $this->setDbTrackReference($v->getDbId()); + } + + $this->aThirdPartyTrackReferences = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the ThirdPartyTrackReferences object, it will not be re-added. + if ($v !== null) { + $v->addCeleryTasks($this); + } + + + return $this; + } + + + /** + * Get the associated ThirdPartyTrackReferences object + * + * @param PropelPDO $con Optional Connection object. + * @param $doQuery Executes a query to get the object if required + * @return ThirdPartyTrackReferences The associated ThirdPartyTrackReferences object. + * @throws PropelException + */ + public function getThirdPartyTrackReferences(PropelPDO $con = null, $doQuery = true) + { + if ($this->aThirdPartyTrackReferences === null && ($this->track_reference !== null) && $doQuery) { + $this->aThirdPartyTrackReferences = ThirdPartyTrackReferencesQuery::create()->findPk($this->track_reference, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aThirdPartyTrackReferences->addCeleryTaskss($this); + */ + } + + return $this->aThirdPartyTrackReferences; + } + + /** + * Clears the current object and sets all attributes to their default values + */ + public function clear() + { + $this->id = null; + $this->task_id = null; + $this->track_reference = null; + $this->name = null; + $this->dispatch_time = null; + $this->status = null; + $this->alreadyInSave = false; + $this->alreadyInValidation = false; + $this->alreadyInClearAllReferencesDeep = false; + $this->clearAllReferences(); + $this->resetModified(); + $this->setNew(true); + $this->setDeleted(false); + } + + /** + * Resets all references to other model objects or collections of model objects. + * + * This method is a user-space workaround for PHP's inability to garbage collect + * objects with circular references (even in PHP 5.3). This is currently necessary + * when using Propel in certain daemon or large-volume/high-memory operations. + * + * @param boolean $deep Whether to also clear the references on all referrer objects. + */ + public function clearAllReferences($deep = false) + { + if ($deep && !$this->alreadyInClearAllReferencesDeep) { + $this->alreadyInClearAllReferencesDeep = true; + if ($this->aThirdPartyTrackReferences instanceof Persistent) { + $this->aThirdPartyTrackReferences->clearAllReferences($deep); + } + + $this->alreadyInClearAllReferencesDeep = false; + } // if ($deep) + + $this->aThirdPartyTrackReferences = null; + } + + /** + * return the string representation of this object + * + * @return string + */ + public function __toString() + { + return (string) $this->exportTo(CeleryTasksPeer::DEFAULT_STRING_FORMAT); + } + + /** + * return true is the object is in saving state + * + * @return boolean + */ + public function isAlreadyInSave() + { + return $this->alreadyInSave; + } + +} diff --git a/airtime_mvc/application/models/airtime/om/BaseCeleryTasksPeer.php b/airtime_mvc/application/models/airtime/om/BaseCeleryTasksPeer.php new file mode 100644 index 000000000..b6dff77b4 --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseCeleryTasksPeer.php @@ -0,0 +1,1019 @@ + array ('DbId', 'DbTaskId', 'DbTrackReference', 'DbName', 'DbDispatchTime', 'DbStatus', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbTaskId', 'dbTrackReference', 'dbName', 'dbDispatchTime', 'dbStatus', ), + BasePeer::TYPE_COLNAME => array (CeleryTasksPeer::ID, CeleryTasksPeer::TASK_ID, CeleryTasksPeer::TRACK_REFERENCE, CeleryTasksPeer::NAME, CeleryTasksPeer::DISPATCH_TIME, CeleryTasksPeer::STATUS, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID', 'TASK_ID', 'TRACK_REFERENCE', 'NAME', 'DISPATCH_TIME', 'STATUS', ), + BasePeer::TYPE_FIELDNAME => array ('id', 'task_id', 'track_reference', 'name', 'dispatch_time', 'status', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + ); + + /** + * holds an array of keys for quick access to the fieldnames array + * + * first dimension keys are the type constants + * e.g. CeleryTasksPeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 + */ + protected static $fieldKeys = array ( + BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbTaskId' => 1, 'DbTrackReference' => 2, 'DbName' => 3, 'DbDispatchTime' => 4, 'DbStatus' => 5, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbTaskId' => 1, 'dbTrackReference' => 2, 'dbName' => 3, 'dbDispatchTime' => 4, 'dbStatus' => 5, ), + BasePeer::TYPE_COLNAME => array (CeleryTasksPeer::ID => 0, CeleryTasksPeer::TASK_ID => 1, CeleryTasksPeer::TRACK_REFERENCE => 2, CeleryTasksPeer::NAME => 3, CeleryTasksPeer::DISPATCH_TIME => 4, CeleryTasksPeer::STATUS => 5, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'TASK_ID' => 1, 'TRACK_REFERENCE' => 2, 'NAME' => 3, 'DISPATCH_TIME' => 4, 'STATUS' => 5, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'task_id' => 1, 'track_reference' => 2, 'name' => 3, 'dispatch_time' => 4, 'status' => 5, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + ); + + /** + * Translates a fieldname to another type + * + * @param string $name field name + * @param string $fromType One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM + * @param string $toType One of the class type constants + * @return string translated name of the field. + * @throws PropelException - if the specified name could not be found in the fieldname mappings. + */ + public static function translateFieldName($name, $fromType, $toType) + { + $toNames = CeleryTasksPeer::getFieldNames($toType); + $key = isset(CeleryTasksPeer::$fieldKeys[$fromType][$name]) ? CeleryTasksPeer::$fieldKeys[$fromType][$name] : null; + if ($key === null) { + throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(CeleryTasksPeer::$fieldKeys[$fromType], true)); + } + + return $toNames[$key]; + } + + /** + * Returns an array of field names. + * + * @param string $type The type of fieldnames to return: + * One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM + * @return array A list of field names + * @throws PropelException - if the type is not valid. + */ + public static function getFieldNames($type = BasePeer::TYPE_PHPNAME) + { + if (!array_key_exists($type, CeleryTasksPeer::$fieldNames)) { + throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. ' . $type . ' was given.'); + } + + return CeleryTasksPeer::$fieldNames[$type]; + } + + /** + * Convenience method which changes table.column to alias.column. + * + * Using this method you can maintain SQL abstraction while using column aliases. + * + * $c->addAlias("alias1", TablePeer::TABLE_NAME); + * $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN); + * + * @param string $alias The alias for the current table. + * @param string $column The column name for current table. (i.e. CeleryTasksPeer::COLUMN_NAME). + * @return string + */ + public static function alias($alias, $column) + { + return str_replace(CeleryTasksPeer::TABLE_NAME.'.', $alias.'.', $column); + } + + /** + * Add all the columns needed to create a new object. + * + * Note: any columns that were marked with lazyLoad="true" in the + * XML schema will not be added to the select list and only loaded + * on demand. + * + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function addSelectColumns(Criteria $criteria, $alias = null) + { + if (null === $alias) { + $criteria->addSelectColumn(CeleryTasksPeer::ID); + $criteria->addSelectColumn(CeleryTasksPeer::TASK_ID); + $criteria->addSelectColumn(CeleryTasksPeer::TRACK_REFERENCE); + $criteria->addSelectColumn(CeleryTasksPeer::NAME); + $criteria->addSelectColumn(CeleryTasksPeer::DISPATCH_TIME); + $criteria->addSelectColumn(CeleryTasksPeer::STATUS); + } else { + $criteria->addSelectColumn($alias . '.id'); + $criteria->addSelectColumn($alias . '.task_id'); + $criteria->addSelectColumn($alias . '.track_reference'); + $criteria->addSelectColumn($alias . '.name'); + $criteria->addSelectColumn($alias . '.dispatch_time'); + $criteria->addSelectColumn($alias . '.status'); + } + } + + /** + * Returns the number of rows matching criteria. + * + * @param Criteria $criteria + * @param boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead. + * @param PropelPDO $con + * @return int Number of matching rows. + */ + public static function doCount(Criteria $criteria, $distinct = false, PropelPDO $con = null) + { + // we may modify criteria, so copy it first + $criteria = clone $criteria; + + // We need to set the primary table name, since in the case that there are no WHERE columns + // it will be impossible for the BasePeer::createSelectSql() method to determine which + // tables go into the FROM clause. + $criteria->setPrimaryTableName(CeleryTasksPeer::TABLE_NAME); + + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->setDistinct(); + } + + if (!$criteria->hasSelectClause()) { + CeleryTasksPeer::addSelectColumns($criteria); + } + + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); // Set the correct dbName + + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + // BasePeer returns a PDOStatement + $stmt = BasePeer::doCount($criteria, $con); + + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $count = (int) $row[0]; + } else { + $count = 0; // no rows returned; we infer that means 0 matches. + } + $stmt->closeCursor(); + + return $count; + } + /** + * Selects one object from the DB. + * + * @param Criteria $criteria object used to create the SELECT statement. + * @param PropelPDO $con + * @return CeleryTasks + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelectOne(Criteria $criteria, PropelPDO $con = null) + { + $critcopy = clone $criteria; + $critcopy->setLimit(1); + $objects = CeleryTasksPeer::doSelect($critcopy, $con); + if ($objects) { + return $objects[0]; + } + + return null; + } + /** + * Selects several row from the DB. + * + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param PropelPDO $con + * @return array Array of selected Objects + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelect(Criteria $criteria, PropelPDO $con = null) + { + return CeleryTasksPeer::populateObjects(CeleryTasksPeer::doSelectStmt($criteria, $con)); + } + /** + * Prepares the Criteria object and uses the parent doSelect() method to execute a PDOStatement. + * + * Use this method directly if you want to work with an executed statement directly (for example + * to perform your own object hydration). + * + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param PropelPDO $con The connection to use + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return PDOStatement The executed PDOStatement object. + * @see BasePeer::doSelect() + */ + public static function doSelectStmt(Criteria $criteria, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + if (!$criteria->hasSelectClause()) { + $criteria = clone $criteria; + CeleryTasksPeer::addSelectColumns($criteria); + } + + // Set the correct dbName + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + + // BasePeer returns a PDOStatement + return BasePeer::doSelect($criteria, $con); + } + /** + * Adds an object to the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases -- especially when you override doSelect*() + * methods in your stub classes -- you may need to explicitly add objects + * to the cache in order to ensure that the same objects are always returned by doSelect*() + * and retrieveByPK*() calls. + * + * @param CeleryTasks $obj A CeleryTasks object. + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + */ + public static function addInstanceToPool($obj, $key = null) + { + if (Propel::isInstancePoolingEnabled()) { + if ($key === null) { + $key = (string) $obj->getDbId(); + } // if key === null + CeleryTasksPeer::$instances[$key] = $obj; + } + } + + /** + * Removes an object from the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases -- especially when you override doDelete + * methods in your stub classes -- you may need to explicitly remove objects + * from the cache in order to prevent returning objects that no longer exist. + * + * @param mixed $value A CeleryTasks object or a primary key value. + * + * @return void + * @throws PropelException - if the value is invalid. + */ + public static function removeInstanceFromPool($value) + { + if (Propel::isInstancePoolingEnabled() && $value !== null) { + if (is_object($value) && $value instanceof CeleryTasks) { + $key = (string) $value->getDbId(); + } elseif (is_scalar($value)) { + // assume we've been passed a primary key + $key = (string) $value; + } else { + $e = new PropelException("Invalid value passed to removeInstanceFromPool(). Expected primary key or CeleryTasks object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value,true))); + throw $e; + } + + unset(CeleryTasksPeer::$instances[$key]); + } + } // removeInstanceFromPool() + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param string $key The key (@see getPrimaryKeyHash()) for this instance. + * @return CeleryTasks Found object or null if 1) no instance exists for specified key or 2) instance pooling has been disabled. + * @see getPrimaryKeyHash() + */ + public static function getInstanceFromPool($key) + { + if (Propel::isInstancePoolingEnabled()) { + if (isset(CeleryTasksPeer::$instances[$key])) { + return CeleryTasksPeer::$instances[$key]; + } + } + + return null; // just to be explicit + } + + /** + * Clear the instance pool. + * + * @return void + */ + public static function clearInstancePool($and_clear_all_references = false) + { + if ($and_clear_all_references) { + foreach (CeleryTasksPeer::$instances as $instance) { + $instance->clearAllReferences(true); + } + } + CeleryTasksPeer::$instances = array(); + } + + /** + * Method to invalidate the instance pool of all tables related to celery_tasks + * by a foreign key with ON DELETE CASCADE + */ + public static function clearRelatedInstancePool() + { + } + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param array $row PropelPDO resultset row. + * @param int $startcol The 0-based offset for reading from the resultset row. + * @return string A string version of PK or null if the components of primary key in result array are all null. + */ + public static function getPrimaryKeyHashFromRow($row, $startcol = 0) + { + // If the PK cannot be derived from the row, return null. + if ($row[$startcol] === null) { + return null; + } + + return (string) $row[$startcol]; + } + + /** + * Retrieves the primary key from the DB resultset row + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, an array of the primary key columns will be returned. + * + * @param array $row PropelPDO resultset row. + * @param int $startcol The 0-based offset for reading from the resultset row. + * @return mixed The primary key of the row + */ + public static function getPrimaryKeyFromRow($row, $startcol = 0) + { + + return (int) $row[$startcol]; + } + + /** + * The returned array will contain objects of the default type or + * objects that inherit from the default. + * + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function populateObjects(PDOStatement $stmt) + { + $results = array(); + + // set the class once to avoid overhead in the loop + $cls = CeleryTasksPeer::getOMClass(); + // populate the object(s) + while ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $key = CeleryTasksPeer::getPrimaryKeyHashFromRow($row, 0); + if (null !== ($obj = CeleryTasksPeer::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, 0, true); // rehydrate + $results[] = $obj; + } else { + $obj = new $cls(); + $obj->hydrate($row); + $results[] = $obj; + CeleryTasksPeer::addInstanceToPool($obj, $key); + } // if key exists + } + $stmt->closeCursor(); + + return $results; + } + /** + * Populates an object of the default type or an object that inherit from the default. + * + * @param array $row PropelPDO resultset row. + * @param int $startcol The 0-based offset for reading from the resultset row. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return array (CeleryTasks object, last column rank) + */ + public static function populateObject($row, $startcol = 0) + { + $key = CeleryTasksPeer::getPrimaryKeyHashFromRow($row, $startcol); + if (null !== ($obj = CeleryTasksPeer::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, $startcol, true); // rehydrate + $col = $startcol + CeleryTasksPeer::NUM_HYDRATE_COLUMNS; + } else { + $cls = CeleryTasksPeer::OM_CLASS; + $obj = new $cls(); + $col = $obj->hydrate($row, $startcol); + CeleryTasksPeer::addInstanceToPool($obj, $key); + } + + return array($obj, $col); + } + + + /** + * Returns the number of rows matching criteria, joining the related ThirdPartyTrackReferences table + * + * @param Criteria $criteria + * @param boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead. + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return int Number of matching rows. + */ + public static function doCountJoinThirdPartyTrackReferences(Criteria $criteria, $distinct = false, PropelPDO $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + // we're going to modify criteria, so copy it first + $criteria = clone $criteria; + + // We need to set the primary table name, since in the case that there are no WHERE columns + // it will be impossible for the BasePeer::createSelectSql() method to determine which + // tables go into the FROM clause. + $criteria->setPrimaryTableName(CeleryTasksPeer::TABLE_NAME); + + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->setDistinct(); + } + + if (!$criteria->hasSelectClause()) { + CeleryTasksPeer::addSelectColumns($criteria); + } + + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count + + // Set the correct dbName + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $criteria->addJoin(CeleryTasksPeer::TRACK_REFERENCE, ThirdPartyTrackReferencesPeer::ID, $join_behavior); + + $stmt = BasePeer::doCount($criteria, $con); + + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $count = (int) $row[0]; + } else { + $count = 0; // no rows returned; we infer that means 0 matches. + } + $stmt->closeCursor(); + + return $count; + } + + + /** + * Selects a collection of CeleryTasks objects pre-filled with their ThirdPartyTrackReferences objects. + * @param Criteria $criteria + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return array Array of CeleryTasks objects. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelectJoinThirdPartyTrackReferences(Criteria $criteria, $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + $criteria = clone $criteria; + + // Set the correct dbName if it has not been overridden + if ($criteria->getDbName() == Propel::getDefaultDB()) { + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + } + + CeleryTasksPeer::addSelectColumns($criteria); + $startcol = CeleryTasksPeer::NUM_HYDRATE_COLUMNS; + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + + $criteria->addJoin(CeleryTasksPeer::TRACK_REFERENCE, ThirdPartyTrackReferencesPeer::ID, $join_behavior); + + $stmt = BasePeer::doSelect($criteria, $con); + $results = array(); + + while ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $key1 = CeleryTasksPeer::getPrimaryKeyHashFromRow($row, 0); + if (null !== ($obj1 = CeleryTasksPeer::getInstanceFromPool($key1))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj1->hydrate($row, 0, true); // rehydrate + } else { + + $cls = CeleryTasksPeer::getOMClass(); + + $obj1 = new $cls(); + $obj1->hydrate($row); + CeleryTasksPeer::addInstanceToPool($obj1, $key1); + } // if $obj1 already loaded + + $key2 = ThirdPartyTrackReferencesPeer::getPrimaryKeyHashFromRow($row, $startcol); + if ($key2 !== null) { + $obj2 = ThirdPartyTrackReferencesPeer::getInstanceFromPool($key2); + if (!$obj2) { + + $cls = ThirdPartyTrackReferencesPeer::getOMClass(); + + $obj2 = new $cls(); + $obj2->hydrate($row, $startcol); + ThirdPartyTrackReferencesPeer::addInstanceToPool($obj2, $key2); + } // if obj2 already loaded + + // Add the $obj1 (CeleryTasks) to $obj2 (ThirdPartyTrackReferences) + $obj2->addCeleryTasks($obj1); + + } // if joined row was not null + + $results[] = $obj1; + } + $stmt->closeCursor(); + + return $results; + } + + + /** + * Returns the number of rows matching criteria, joining all related tables + * + * @param Criteria $criteria + * @param boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead. + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return int Number of matching rows. + */ + public static function doCountJoinAll(Criteria $criteria, $distinct = false, PropelPDO $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + // we're going to modify criteria, so copy it first + $criteria = clone $criteria; + + // We need to set the primary table name, since in the case that there are no WHERE columns + // it will be impossible for the BasePeer::createSelectSql() method to determine which + // tables go into the FROM clause. + $criteria->setPrimaryTableName(CeleryTasksPeer::TABLE_NAME); + + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->setDistinct(); + } + + if (!$criteria->hasSelectClause()) { + CeleryTasksPeer::addSelectColumns($criteria); + } + + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count + + // Set the correct dbName + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $criteria->addJoin(CeleryTasksPeer::TRACK_REFERENCE, ThirdPartyTrackReferencesPeer::ID, $join_behavior); + + $stmt = BasePeer::doCount($criteria, $con); + + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $count = (int) $row[0]; + } else { + $count = 0; // no rows returned; we infer that means 0 matches. + } + $stmt->closeCursor(); + + return $count; + } + + /** + * Selects a collection of CeleryTasks objects pre-filled with all related objects. + * + * @param Criteria $criteria + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return array Array of CeleryTasks objects. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelectJoinAll(Criteria $criteria, $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + $criteria = clone $criteria; + + // Set the correct dbName if it has not been overridden + if ($criteria->getDbName() == Propel::getDefaultDB()) { + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + } + + CeleryTasksPeer::addSelectColumns($criteria); + $startcol2 = CeleryTasksPeer::NUM_HYDRATE_COLUMNS; + + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + $startcol3 = $startcol2 + ThirdPartyTrackReferencesPeer::NUM_HYDRATE_COLUMNS; + + $criteria->addJoin(CeleryTasksPeer::TRACK_REFERENCE, ThirdPartyTrackReferencesPeer::ID, $join_behavior); + + $stmt = BasePeer::doSelect($criteria, $con); + $results = array(); + + while ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $key1 = CeleryTasksPeer::getPrimaryKeyHashFromRow($row, 0); + if (null !== ($obj1 = CeleryTasksPeer::getInstanceFromPool($key1))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj1->hydrate($row, 0, true); // rehydrate + } else { + $cls = CeleryTasksPeer::getOMClass(); + + $obj1 = new $cls(); + $obj1->hydrate($row); + CeleryTasksPeer::addInstanceToPool($obj1, $key1); + } // if obj1 already loaded + + // Add objects for joined ThirdPartyTrackReferences rows + + $key2 = ThirdPartyTrackReferencesPeer::getPrimaryKeyHashFromRow($row, $startcol2); + if ($key2 !== null) { + $obj2 = ThirdPartyTrackReferencesPeer::getInstanceFromPool($key2); + if (!$obj2) { + + $cls = ThirdPartyTrackReferencesPeer::getOMClass(); + + $obj2 = new $cls(); + $obj2->hydrate($row, $startcol2); + ThirdPartyTrackReferencesPeer::addInstanceToPool($obj2, $key2); + } // if obj2 loaded + + // Add the $obj1 (CeleryTasks) to the collection in $obj2 (ThirdPartyTrackReferences) + $obj2->addCeleryTasks($obj1); + } // if joined row not null + + $results[] = $obj1; + } + $stmt->closeCursor(); + + return $results; + } + + /** + * Returns the TableMap related to this peer. + * This method is not needed for general use but a specific application could have a need. + * @return TableMap + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getTableMap() + { + return Propel::getDatabaseMap(CeleryTasksPeer::DATABASE_NAME)->getTable(CeleryTasksPeer::TABLE_NAME); + } + + /** + * Add a TableMap instance to the database for this peer class. + */ + public static function buildTableMap() + { + $dbMap = Propel::getDatabaseMap(BaseCeleryTasksPeer::DATABASE_NAME); + if (!$dbMap->hasTable(BaseCeleryTasksPeer::TABLE_NAME)) { + $dbMap->addTableObject(new \CeleryTasksTableMap()); + } + } + + /** + * The class that the Peer will make instances of. + * + * + * @return string ClassName + */ + public static function getOMClass($row = 0, $colnum = 0) + { + return CeleryTasksPeer::OM_CLASS; + } + + /** + * Performs an INSERT on the database, given a CeleryTasks or Criteria object. + * + * @param mixed $values Criteria or CeleryTasks object containing data that is used to create the INSERT statement. + * @param PropelPDO $con the PropelPDO connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doInsert($values, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + if ($values instanceof Criteria) { + $criteria = clone $values; // rename for clarity + } else { + $criteria = $values->buildCriteria(); // build Criteria from CeleryTasks object + } + + if ($criteria->containsKey(CeleryTasksPeer::ID) && $criteria->keyContainsValue(CeleryTasksPeer::ID) ) { + throw new PropelException('Cannot insert a value for auto-increment primary key ('.CeleryTasksPeer::ID.')'); + } + + + // Set the correct dbName + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + + try { + // use transaction because $criteria could contain info + // for more than one table (I guess, conceivably) + $con->beginTransaction(); + $pk = BasePeer::doInsert($criteria, $con); + $con->commit(); + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + + return $pk; + } + + /** + * Performs an UPDATE on the database, given a CeleryTasks or Criteria object. + * + * @param mixed $values Criteria or CeleryTasks object containing data that is used to create the UPDATE statement. + * @param PropelPDO $con The connection to use (specify PropelPDO connection object to exert more control over transactions). + * @return int The number of affected rows (if supported by underlying database driver). + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doUpdate($values, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + $selectCriteria = new Criteria(CeleryTasksPeer::DATABASE_NAME); + + if ($values instanceof Criteria) { + $criteria = clone $values; // rename for clarity + + $comparison = $criteria->getComparison(CeleryTasksPeer::ID); + $value = $criteria->remove(CeleryTasksPeer::ID); + if ($value) { + $selectCriteria->add(CeleryTasksPeer::ID, $value, $comparison); + } else { + $selectCriteria->setPrimaryTableName(CeleryTasksPeer::TABLE_NAME); + } + + } else { // $values is CeleryTasks object + $criteria = $values->buildCriteria(); // gets full criteria + $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s) + } + + // set the correct dbName + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + + return BasePeer::doUpdate($selectCriteria, $criteria, $con); + } + + /** + * Deletes all rows from the celery_tasks table. + * + * @param PropelPDO $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + * @throws PropelException + */ + public static function doDeleteAll(PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + $affectedRows = 0; // initialize var to track total num of affected rows + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + $affectedRows += BasePeer::doDeleteAll(CeleryTasksPeer::TABLE_NAME, $con, CeleryTasksPeer::DATABASE_NAME); + // Because this db requires some delete cascade/set null emulation, we have to + // clear the cached instance *after* the emulation has happened (since + // instances get re-added by the select statement contained therein). + CeleryTasksPeer::clearInstancePool(); + CeleryTasksPeer::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs a DELETE on the database, given a CeleryTasks or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or CeleryTasks object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param PropelPDO $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doDelete($values, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + if ($values instanceof Criteria) { + // invalidate the cache for all objects of this type, since we have no + // way of knowing (without running a query) what objects should be invalidated + // from the cache based on this Criteria. + CeleryTasksPeer::clearInstancePool(); + // rename for clarity + $criteria = clone $values; + } elseif ($values instanceof CeleryTasks) { // it's a model object + // invalidate the cache for this single object + CeleryTasksPeer::removeInstanceFromPool($values); + // create criteria based on pk values + $criteria = $values->buildPkeyCriteria(); + } else { // it's a primary key, or an array of pks + $criteria = new Criteria(CeleryTasksPeer::DATABASE_NAME); + $criteria->add(CeleryTasksPeer::ID, (array) $values, Criteria::IN); + // invalidate the cache for this object(s) + foreach ((array) $values as $singleval) { + CeleryTasksPeer::removeInstanceFromPool($singleval); + } + } + + // Set the correct dbName + $criteria->setDbName(CeleryTasksPeer::DATABASE_NAME); + + $affectedRows = 0; // initialize var to track total num of affected rows + + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + + $affectedRows += BasePeer::doDelete($criteria, $con); + CeleryTasksPeer::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Validates all modified columns of given CeleryTasks object. + * If parameter $columns is either a single column name or an array of column names + * than only those columns are validated. + * + * NOTICE: This does not apply to primary or foreign keys for now. + * + * @param CeleryTasks $obj The object to validate. + * @param mixed $cols Column name or array of column names. + * + * @return mixed TRUE if all columns are valid or the error message of the first invalid column. + */ + public static function doValidate($obj, $cols = null) + { + $columns = array(); + + if ($cols) { + $dbMap = Propel::getDatabaseMap(CeleryTasksPeer::DATABASE_NAME); + $tableMap = $dbMap->getTable(CeleryTasksPeer::TABLE_NAME); + + if (! is_array($cols)) { + $cols = array($cols); + } + + foreach ($cols as $colName) { + if ($tableMap->hasColumn($colName)) { + $get = 'get' . $tableMap->getColumn($colName)->getPhpName(); + $columns[$colName] = $obj->$get(); + } + } + } else { + + } + + return BasePeer::doValidate(CeleryTasksPeer::DATABASE_NAME, CeleryTasksPeer::TABLE_NAME, $columns); + } + + /** + * Retrieve a single object by pkey. + * + * @param int $pk the primary key. + * @param PropelPDO $con the connection to use + * @return CeleryTasks + */ + public static function retrieveByPK($pk, PropelPDO $con = null) + { + + if (null !== ($obj = CeleryTasksPeer::getInstanceFromPool((string) $pk))) { + return $obj; + } + + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $criteria = new Criteria(CeleryTasksPeer::DATABASE_NAME); + $criteria->add(CeleryTasksPeer::ID, $pk); + + $v = CeleryTasksPeer::doSelect($criteria, $con); + + return !empty($v) > 0 ? $v[0] : null; + } + + /** + * Retrieve multiple objects by pkey. + * + * @param array $pks List of primary keys + * @param PropelPDO $con the connection to use + * @return CeleryTasks[] + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function retrieveByPKs($pks, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $objs = null; + if (empty($pks)) { + $objs = array(); + } else { + $criteria = new Criteria(CeleryTasksPeer::DATABASE_NAME); + $criteria->add(CeleryTasksPeer::ID, $pks, Criteria::IN); + $objs = CeleryTasksPeer::doSelect($criteria, $con); + } + + return $objs; + } + +} // BaseCeleryTasksPeer + +// This is the static code needed to register the TableMap for this table with the main Propel class. +// +BaseCeleryTasksPeer::buildTableMap(); + diff --git a/airtime_mvc/application/models/airtime/om/BaseCeleryTasksQuery.php b/airtime_mvc/application/models/airtime/om/BaseCeleryTasksQuery.php new file mode 100644 index 000000000..9d25080d0 --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseCeleryTasksQuery.php @@ -0,0 +1,550 @@ +mergeWith($criteria); + } + + return $query; + } + + /** + * Find object by primary key. + * Propel uses the instance pool to skip the database if the object exists. + * Go fast if the query is untouched. + * + * + * $obj = $c->findPk(12, $con); + * + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con an optional connection object + * + * @return CeleryTasks|CeleryTasks[]|mixed the result, formatted by the current formatter + */ + public function findPk($key, $con = null) + { + if ($key === null) { + return null; + } + if ((null !== ($obj = CeleryTasksPeer::getInstanceFromPool((string) $key))) && !$this->formatter) { + // the object is already in the instance pool + return $obj; + } + if ($con === null) { + $con = Propel::getConnection(CeleryTasksPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + $this->basePreSelect($con); + if ($this->formatter || $this->modelAlias || $this->with || $this->select + || $this->selectColumns || $this->asColumns || $this->selectModifiers + || $this->map || $this->having || $this->joins) { + return $this->findPkComplex($key, $con); + } else { + return $this->findPkSimple($key, $con); + } + } + + /** + * Alias of findPk to use instance pooling + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con A connection object + * + * @return CeleryTasks A model object, or null if the key is not found + * @throws PropelException + */ + public function findOneByDbId($key, $con = null) + { + return $this->findPk($key, $con); + } + + /** + * Find object by primary key using raw SQL to go fast. + * Bypass doSelect() and the object formatter by using generated code. + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con A connection object + * + * @return CeleryTasks A model object, or null if the key is not found + * @throws PropelException + */ + protected function findPkSimple($key, $con) + { + $sql = 'SELECT "id", "task_id", "track_reference", "name", "dispatch_time", "status" FROM "celery_tasks" WHERE "id" = :p0'; + try { + $stmt = $con->prepare($sql); + $stmt->bindValue(':p0', $key, PDO::PARAM_INT); + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), $e); + } + $obj = null; + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $obj = new CeleryTasks(); + $obj->hydrate($row); + CeleryTasksPeer::addInstanceToPool($obj, (string) $key); + } + $stmt->closeCursor(); + + return $obj; + } + + /** + * Find object by primary key. + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con A connection object + * + * @return CeleryTasks|CeleryTasks[]|mixed the result, formatted by the current formatter + */ + protected function findPkComplex($key, $con) + { + // As the query uses a PK condition, no limit(1) is necessary. + $criteria = $this->isKeepQuery() ? clone $this : $this; + $stmt = $criteria + ->filterByPrimaryKey($key) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->formatOne($stmt); + } + + /** + * Find objects by primary key + * + * $objs = $c->findPks(array(12, 56, 832), $con); + * + * @param array $keys Primary keys to use for the query + * @param PropelPDO $con an optional connection object + * + * @return PropelObjectCollection|CeleryTasks[]|mixed the list of results, formatted by the current formatter + */ + public function findPks($keys, $con = null) + { + if ($con === null) { + $con = Propel::getConnection($this->getDbName(), Propel::CONNECTION_READ); + } + $this->basePreSelect($con); + $criteria = $this->isKeepQuery() ? clone $this : $this; + $stmt = $criteria + ->filterByPrimaryKeys($keys) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->format($stmt); + } + + /** + * Filter the query by primary key + * + * @param mixed $key Primary key to use for the query + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByPrimaryKey($key) + { + + return $this->addUsingAlias(CeleryTasksPeer::ID, $key, Criteria::EQUAL); + } + + /** + * Filter the query by a list of primary keys + * + * @param array $keys The list of primary key to use for the query + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByPrimaryKeys($keys) + { + + return $this->addUsingAlias(CeleryTasksPeer::ID, $keys, Criteria::IN); + } + + /** + * Filter the query on the id column + * + * Example usage: + * + * $query->filterByDbId(1234); // WHERE id = 1234 + * $query->filterByDbId(array(12, 34)); // WHERE id IN (12, 34) + * $query->filterByDbId(array('min' => 12)); // WHERE id >= 12 + * $query->filterByDbId(array('max' => 12)); // WHERE id <= 12 + * + * + * @param mixed $dbId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByDbId($dbId = null, $comparison = null) + { + if (is_array($dbId)) { + $useMinMax = false; + if (isset($dbId['min'])) { + $this->addUsingAlias(CeleryTasksPeer::ID, $dbId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($dbId['max'])) { + $this->addUsingAlias(CeleryTasksPeer::ID, $dbId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CeleryTasksPeer::ID, $dbId, $comparison); + } + + /** + * Filter the query on the task_id column + * + * Example usage: + * + * $query->filterByDbTaskId('fooValue'); // WHERE task_id = 'fooValue' + * $query->filterByDbTaskId('%fooValue%'); // WHERE task_id LIKE '%fooValue%' + * + * + * @param string $dbTaskId The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByDbTaskId($dbTaskId = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbTaskId)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbTaskId)) { + $dbTaskId = str_replace('*', '%', $dbTaskId); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CeleryTasksPeer::TASK_ID, $dbTaskId, $comparison); + } + + /** + * Filter the query on the track_reference column + * + * Example usage: + * + * $query->filterByDbTrackReference(1234); // WHERE track_reference = 1234 + * $query->filterByDbTrackReference(array(12, 34)); // WHERE track_reference IN (12, 34) + * $query->filterByDbTrackReference(array('min' => 12)); // WHERE track_reference >= 12 + * $query->filterByDbTrackReference(array('max' => 12)); // WHERE track_reference <= 12 + * + * + * @see filterByThirdPartyTrackReferences() + * + * @param mixed $dbTrackReference The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByDbTrackReference($dbTrackReference = null, $comparison = null) + { + if (is_array($dbTrackReference)) { + $useMinMax = false; + if (isset($dbTrackReference['min'])) { + $this->addUsingAlias(CeleryTasksPeer::TRACK_REFERENCE, $dbTrackReference['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($dbTrackReference['max'])) { + $this->addUsingAlias(CeleryTasksPeer::TRACK_REFERENCE, $dbTrackReference['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CeleryTasksPeer::TRACK_REFERENCE, $dbTrackReference, $comparison); + } + + /** + * Filter the query on the name column + * + * Example usage: + * + * $query->filterByDbName('fooValue'); // WHERE name = 'fooValue' + * $query->filterByDbName('%fooValue%'); // WHERE name LIKE '%fooValue%' + * + * + * @param string $dbName The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByDbName($dbName = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbName)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbName)) { + $dbName = str_replace('*', '%', $dbName); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CeleryTasksPeer::NAME, $dbName, $comparison); + } + + /** + * Filter the query on the dispatch_time column + * + * Example usage: + * + * $query->filterByDbDispatchTime('2011-03-14'); // WHERE dispatch_time = '2011-03-14' + * $query->filterByDbDispatchTime('now'); // WHERE dispatch_time = '2011-03-14' + * $query->filterByDbDispatchTime(array('max' => 'yesterday')); // WHERE dispatch_time < '2011-03-13' + * + * + * @param mixed $dbDispatchTime The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByDbDispatchTime($dbDispatchTime = null, $comparison = null) + { + if (is_array($dbDispatchTime)) { + $useMinMax = false; + if (isset($dbDispatchTime['min'])) { + $this->addUsingAlias(CeleryTasksPeer::DISPATCH_TIME, $dbDispatchTime['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($dbDispatchTime['max'])) { + $this->addUsingAlias(CeleryTasksPeer::DISPATCH_TIME, $dbDispatchTime['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(CeleryTasksPeer::DISPATCH_TIME, $dbDispatchTime, $comparison); + } + + /** + * Filter the query on the status column + * + * Example usage: + * + * $query->filterByDbStatus('fooValue'); // WHERE status = 'fooValue' + * $query->filterByDbStatus('%fooValue%'); // WHERE status LIKE '%fooValue%' + * + * + * @param string $dbStatus The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function filterByDbStatus($dbStatus = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbStatus)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbStatus)) { + $dbStatus = str_replace('*', '%', $dbStatus); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(CeleryTasksPeer::STATUS, $dbStatus, $comparison); + } + + /** + * Filter the query by a related ThirdPartyTrackReferences object + * + * @param ThirdPartyTrackReferences|PropelObjectCollection $thirdPartyTrackReferences The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return CeleryTasksQuery The current query, for fluid interface + * @throws PropelException - if the provided filter is invalid. + */ + public function filterByThirdPartyTrackReferences($thirdPartyTrackReferences, $comparison = null) + { + if ($thirdPartyTrackReferences instanceof ThirdPartyTrackReferences) { + return $this + ->addUsingAlias(CeleryTasksPeer::TRACK_REFERENCE, $thirdPartyTrackReferences->getDbId(), $comparison); + } elseif ($thirdPartyTrackReferences instanceof PropelObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(CeleryTasksPeer::TRACK_REFERENCE, $thirdPartyTrackReferences->toKeyValue('PrimaryKey', 'DbId'), $comparison); + } else { + throw new PropelException('filterByThirdPartyTrackReferences() only accepts arguments of type ThirdPartyTrackReferences or PropelCollection'); + } + } + + /** + * Adds a JOIN clause to the query using the ThirdPartyTrackReferences relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function joinThirdPartyTrackReferences($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('ThirdPartyTrackReferences'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'ThirdPartyTrackReferences'); + } + + return $this; + } + + /** + * Use the ThirdPartyTrackReferences relation ThirdPartyTrackReferences object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ThirdPartyTrackReferencesQuery A secondary query class using the current class as primary query + */ + public function useThirdPartyTrackReferencesQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinThirdPartyTrackReferences($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'ThirdPartyTrackReferences', 'ThirdPartyTrackReferencesQuery'); + } + + /** + * Exclude object from result + * + * @param CeleryTasks $celeryTasks Object to remove from the list of results + * + * @return CeleryTasksQuery The current query, for fluid interface + */ + public function prune($celeryTasks = null) + { + if ($celeryTasks) { + $this->addUsingAlias(CeleryTasksPeer::ID, $celeryTasks->getDbId(), Criteria::NOT_EQUAL); + } + + return $this; + } + +} diff --git a/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferences.php b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferences.php new file mode 100644 index 000000000..a7860e1eb --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferences.php @@ -0,0 +1,1487 @@ +id; + } + + /** + * Get the [service] column value. + * + * @return string + */ + public function getDbService() + { + + return $this->service; + } + + /** + * Get the [foreign_id] column value. + * + * @return string + */ + public function getDbForeignId() + { + + return $this->foreign_id; + } + + /** + * Get the [file_id] column value. + * + * @return int + */ + public function getDbFileId() + { + + return $this->file_id; + } + + /** + * Get the [optionally formatted] temporal [upload_time] column value. + * + * + * @param string $format The date/time format string (either date()-style or strftime()-style). + * If format is null, then the raw DateTime object will be returned. + * @return mixed Formatted date/time value as string or DateTime object (if format is null), null if column is null + * @throws PropelException - if unable to parse/validate the date/time value. + */ + public function getDbUploadTime($format = 'Y-m-d H:i:s') + { + if ($this->upload_time === null) { + return null; + } + + + try { + $dt = new DateTime($this->upload_time); + } catch (Exception $x) { + throw new PropelException("Internally stored date/time/timestamp value could not be converted to DateTime: " . var_export($this->upload_time, true), $x); + } + + if ($format === null) { + // Because propel.useDateTimeClass is true, we return a DateTime object. + return $dt; + } + + if (strpos($format, '%') !== false) { + return strftime($format, $dt->format('U')); + } + + return $dt->format($format); + + } + + /** + * Get the [status] column value. + * + * @return string + */ + public function getDbStatus() + { + + return $this->status; + } + + /** + * Set the value of [id] column. + * + * @param int $v new value + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setDbId($v) + { + if ($v !== null && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->id !== $v) { + $this->id = $v; + $this->modifiedColumns[] = ThirdPartyTrackReferencesPeer::ID; + } + + + return $this; + } // setDbId() + + /** + * Set the value of [service] column. + * + * @param string $v new value + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setDbService($v) + { + if ($v !== null && is_numeric($v)) { + $v = (string) $v; + } + + if ($this->service !== $v) { + $this->service = $v; + $this->modifiedColumns[] = ThirdPartyTrackReferencesPeer::SERVICE; + } + + + return $this; + } // setDbService() + + /** + * Set the value of [foreign_id] column. + * + * @param string $v new value + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setDbForeignId($v) + { + if ($v !== null && is_numeric($v)) { + $v = (string) $v; + } + + if ($this->foreign_id !== $v) { + $this->foreign_id = $v; + $this->modifiedColumns[] = ThirdPartyTrackReferencesPeer::FOREIGN_ID; + } + + + return $this; + } // setDbForeignId() + + /** + * Set the value of [file_id] column. + * + * @param int $v new value + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setDbFileId($v) + { + if ($v !== null && is_numeric($v)) { + $v = (int) $v; + } + + if ($this->file_id !== $v) { + $this->file_id = $v; + $this->modifiedColumns[] = ThirdPartyTrackReferencesPeer::FILE_ID; + } + + if ($this->aCcFiles !== null && $this->aCcFiles->getDbId() !== $v) { + $this->aCcFiles = null; + } + + + return $this; + } // setDbFileId() + + /** + * Sets the value of [upload_time] column to a normalized version of the date/time value specified. + * + * @param mixed $v string, integer (timestamp), or DateTime value. + * Empty strings are treated as null. + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setDbUploadTime($v) + { + $dt = PropelDateTime::newInstance($v, null, 'DateTime'); + if ($this->upload_time !== null || $dt !== null) { + $currentDateAsString = ($this->upload_time !== null && $tmpDt = new DateTime($this->upload_time)) ? $tmpDt->format('Y-m-d H:i:s') : null; + $newDateAsString = $dt ? $dt->format('Y-m-d H:i:s') : null; + if ($currentDateAsString !== $newDateAsString) { + $this->upload_time = $newDateAsString; + $this->modifiedColumns[] = ThirdPartyTrackReferencesPeer::UPLOAD_TIME; + } + } // if either are not null + + + return $this; + } // setDbUploadTime() + + /** + * Set the value of [status] column. + * + * @param string $v new value + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setDbStatus($v) + { + if ($v !== null && is_numeric($v)) { + $v = (string) $v; + } + + if ($this->status !== $v) { + $this->status = $v; + $this->modifiedColumns[] = ThirdPartyTrackReferencesPeer::STATUS; + } + + + return $this; + } // setDbStatus() + + /** + * Indicates whether the columns in this object are only set to default values. + * + * This method can be used in conjunction with isModified() to indicate whether an object is both + * modified _and_ has some values set which are non-default. + * + * @return boolean Whether the columns in this object are only been set with default values. + */ + public function hasOnlyDefaultValues() + { + // otherwise, everything was equal, so return true + return true; + } // hasOnlyDefaultValues() + + /** + * Hydrates (populates) the object variables with values from the database resultset. + * + * An offset (0-based "start column") is specified so that objects can be hydrated + * with a subset of the columns in the resultset rows. This is needed, for example, + * for results of JOIN queries where the resultset row includes columns from two or + * more tables. + * + * @param array $row The row returned by PDOStatement->fetch(PDO::FETCH_NUM) + * @param int $startcol 0-based offset column which indicates which resultset column to start with. + * @param boolean $rehydrate Whether this object is being re-hydrated from the database. + * @return int next starting column + * @throws PropelException - Any caught Exception will be rewrapped as a PropelException. + */ + public function hydrate($row, $startcol = 0, $rehydrate = false) + { + try { + + $this->id = ($row[$startcol + 0] !== null) ? (int) $row[$startcol + 0] : null; + $this->service = ($row[$startcol + 1] !== null) ? (string) $row[$startcol + 1] : null; + $this->foreign_id = ($row[$startcol + 2] !== null) ? (string) $row[$startcol + 2] : null; + $this->file_id = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null; + $this->upload_time = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null; + $this->status = ($row[$startcol + 5] !== null) ? (string) $row[$startcol + 5] : null; + $this->resetModified(); + + $this->setNew(false); + + if ($rehydrate) { + $this->ensureConsistency(); + } + $this->postHydrate($row, $startcol, $rehydrate); + + return $startcol + 6; // 6 = ThirdPartyTrackReferencesPeer::NUM_HYDRATE_COLUMNS. + + } catch (Exception $e) { + throw new PropelException("Error populating ThirdPartyTrackReferences object", $e); + } + } + + /** + * Checks and repairs the internal consistency of the object. + * + * This method is executed after an already-instantiated object is re-hydrated + * from the database. It exists to check any foreign keys to make sure that + * the objects related to the current object are correct based on foreign key. + * + * You can override this method in the stub class, but you should always invoke + * the base method from the overridden method (i.e. parent::ensureConsistency()), + * in case your model changes. + * + * @throws PropelException + */ + public function ensureConsistency() + { + + if ($this->aCcFiles !== null && $this->file_id !== $this->aCcFiles->getDbId()) { + $this->aCcFiles = null; + } + } // ensureConsistency + + /** + * Reloads this object from datastore based on primary key and (optionally) resets all associated objects. + * + * This will only work if the object has been saved and has a valid primary key set. + * + * @param boolean $deep (optional) Whether to also de-associated any related objects. + * @param PropelPDO $con (optional) The PropelPDO connection to use. + * @return void + * @throws PropelException - if this object is deleted, unsaved or doesn't have pk match in db + */ + public function reload($deep = false, PropelPDO $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("Cannot reload a deleted object."); + } + + if ($this->isNew()) { + throw new PropelException("Cannot reload an unsaved object."); + } + + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + // We don't need to alter the object instance pool; we're just modifying this instance + // already in the pool. + + $stmt = ThirdPartyTrackReferencesPeer::doSelectStmt($this->buildPkeyCriteria(), $con); + $row = $stmt->fetch(PDO::FETCH_NUM); + $stmt->closeCursor(); + if (!$row) { + throw new PropelException('Cannot find matching row in the database to reload object values.'); + } + $this->hydrate($row, 0, true); // rehydrate + + if ($deep) { // also de-associate any related objects? + + $this->aCcFiles = null; + $this->collCeleryTaskss = null; + + } // if (deep) + } + + /** + * Removes this object from datastore and sets delete attribute. + * + * @param PropelPDO $con + * @return void + * @throws PropelException + * @throws Exception + * @see BaseObject::setDeleted() + * @see BaseObject::isDeleted() + */ + public function delete(PropelPDO $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("This object has already been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + $con->beginTransaction(); + try { + $deleteQuery = ThirdPartyTrackReferencesQuery::create() + ->filterByPrimaryKey($this->getPrimaryKey()); + $ret = $this->preDelete($con); + if ($ret) { + $deleteQuery->delete($con); + $this->postDelete($con); + $con->commit(); + $this->setDeleted(true); + } else { + $con->commit(); + } + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Persists this object to the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All modified related objects will also be persisted in the doSave() + * method. This method wraps all precipitate database operations in a + * single transaction. + * + * @param PropelPDO $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @throws Exception + * @see doSave() + */ + public function save(PropelPDO $con = null) + { + if ($this->isDeleted()) { + throw new PropelException("You cannot save an object that has been deleted."); + } + + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + $con->beginTransaction(); + $isInsert = $this->isNew(); + try { + $ret = $this->preSave($con); + if ($isInsert) { + $ret = $ret && $this->preInsert($con); + } else { + $ret = $ret && $this->preUpdate($con); + } + if ($ret) { + $affectedRows = $this->doSave($con); + if ($isInsert) { + $this->postInsert($con); + } else { + $this->postUpdate($con); + } + $this->postSave($con); + ThirdPartyTrackReferencesPeer::addInstanceToPool($this); + } else { + $affectedRows = 0; + } + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs the work of inserting or updating the row in the database. + * + * If the object is new, it inserts it; otherwise an update is performed. + * All related objects are also updated in this method. + * + * @param PropelPDO $con + * @return int The number of rows affected by this insert/update and any referring fk objects' save() operations. + * @throws PropelException + * @see save() + */ + protected function doSave(PropelPDO $con) + { + $affectedRows = 0; // initialize var to track total num of affected rows + if (!$this->alreadyInSave) { + $this->alreadyInSave = true; + + // We call the save method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aCcFiles !== null) { + if ($this->aCcFiles->isModified() || $this->aCcFiles->isNew()) { + $affectedRows += $this->aCcFiles->save($con); + } + $this->setCcFiles($this->aCcFiles); + } + + if ($this->isNew() || $this->isModified()) { + // persist changes + if ($this->isNew()) { + $this->doInsert($con); + } else { + $this->doUpdate($con); + } + $affectedRows += 1; + $this->resetModified(); + } + + if ($this->celeryTaskssScheduledForDeletion !== null) { + if (!$this->celeryTaskssScheduledForDeletion->isEmpty()) { + CeleryTasksQuery::create() + ->filterByPrimaryKeys($this->celeryTaskssScheduledForDeletion->getPrimaryKeys(false)) + ->delete($con); + $this->celeryTaskssScheduledForDeletion = null; + } + } + + if ($this->collCeleryTaskss !== null) { + foreach ($this->collCeleryTaskss as $referrerFK) { + if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) { + $affectedRows += $referrerFK->save($con); + } + } + } + + $this->alreadyInSave = false; + + } + + return $affectedRows; + } // doSave() + + /** + * Insert the row in the database. + * + * @param PropelPDO $con + * + * @throws PropelException + * @see doSave() + */ + protected function doInsert(PropelPDO $con) + { + $modifiedColumns = array(); + $index = 0; + + $this->modifiedColumns[] = ThirdPartyTrackReferencesPeer::ID; + if (null !== $this->id) { + throw new PropelException('Cannot insert a value for auto-increment primary key (' . ThirdPartyTrackReferencesPeer::ID . ')'); + } + if (null === $this->id) { + try { + $stmt = $con->query("SELECT nextval('third_party_track_references_id_seq')"); + $row = $stmt->fetch(PDO::FETCH_NUM); + $this->id = $row[0]; + } catch (Exception $e) { + throw new PropelException('Unable to get sequence id.', $e); + } + } + + + // check the columns in natural order for more readable SQL queries + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::ID)) { + $modifiedColumns[':p' . $index++] = '"id"'; + } + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::SERVICE)) { + $modifiedColumns[':p' . $index++] = '"service"'; + } + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::FOREIGN_ID)) { + $modifiedColumns[':p' . $index++] = '"foreign_id"'; + } + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::FILE_ID)) { + $modifiedColumns[':p' . $index++] = '"file_id"'; + } + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::UPLOAD_TIME)) { + $modifiedColumns[':p' . $index++] = '"upload_time"'; + } + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::STATUS)) { + $modifiedColumns[':p' . $index++] = '"status"'; + } + + $sql = sprintf( + 'INSERT INTO "third_party_track_references" (%s) VALUES (%s)', + implode(', ', $modifiedColumns), + implode(', ', array_keys($modifiedColumns)) + ); + + try { + $stmt = $con->prepare($sql); + foreach ($modifiedColumns as $identifier => $columnName) { + switch ($columnName) { + case '"id"': + $stmt->bindValue($identifier, $this->id, PDO::PARAM_INT); + break; + case '"service"': + $stmt->bindValue($identifier, $this->service, PDO::PARAM_STR); + break; + case '"foreign_id"': + $stmt->bindValue($identifier, $this->foreign_id, PDO::PARAM_STR); + break; + case '"file_id"': + $stmt->bindValue($identifier, $this->file_id, PDO::PARAM_INT); + break; + case '"upload_time"': + $stmt->bindValue($identifier, $this->upload_time, PDO::PARAM_STR); + break; + case '"status"': + $stmt->bindValue($identifier, $this->status, PDO::PARAM_STR); + break; + } + } + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute INSERT statement [%s]', $sql), $e); + } + + $this->setNew(false); + } + + /** + * Update the row in the database. + * + * @param PropelPDO $con + * + * @see doSave() + */ + protected function doUpdate(PropelPDO $con) + { + $selectCriteria = $this->buildPkeyCriteria(); + $valuesCriteria = $this->buildCriteria(); + BasePeer::doUpdate($selectCriteria, $valuesCriteria, $con); + } + + /** + * Array of ValidationFailed objects. + * @var array ValidationFailed[] + */ + protected $validationFailures = array(); + + /** + * Gets any ValidationFailed objects that resulted from last call to validate(). + * + * + * @return array ValidationFailed[] + * @see validate() + */ + public function getValidationFailures() + { + return $this->validationFailures; + } + + /** + * Validates the objects modified field values and all objects related to this table. + * + * If $columns is either a column name or an array of column names + * only those columns are validated. + * + * @param mixed $columns Column name or an array of column names. + * @return boolean Whether all columns pass validation. + * @see doValidate() + * @see getValidationFailures() + */ + public function validate($columns = null) + { + $res = $this->doValidate($columns); + if ($res === true) { + $this->validationFailures = array(); + + return true; + } + + $this->validationFailures = $res; + + return false; + } + + /** + * This function performs the validation work for complex object models. + * + * In addition to checking the current object, all related objects will + * also be validated. If all pass then true is returned; otherwise + * an aggregated array of ValidationFailed objects will be returned. + * + * @param array $columns Array of column names to validate. + * @return mixed true if all validations pass; array of ValidationFailed objects otherwise. + */ + protected function doValidate($columns = null) + { + if (!$this->alreadyInValidation) { + $this->alreadyInValidation = true; + $retval = null; + + $failureMap = array(); + + + // We call the validate method on the following object(s) if they + // were passed to this object by their corresponding set + // method. This object relates to these object(s) by a + // foreign key reference. + + if ($this->aCcFiles !== null) { + if (!$this->aCcFiles->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aCcFiles->getValidationFailures()); + } + } + + + if (($retval = ThirdPartyTrackReferencesPeer::doValidate($this, $columns)) !== true) { + $failureMap = array_merge($failureMap, $retval); + } + + + if ($this->collCeleryTaskss !== null) { + foreach ($this->collCeleryTaskss as $referrerFK) { + if (!$referrerFK->validate($columns)) { + $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); + } + } + } + + + $this->alreadyInValidation = false; + } + + return (!empty($failureMap) ? $failureMap : true); + } + + /** + * Retrieves a field from the object by name passed in as a string. + * + * @param string $name name + * @param string $type The type of fieldname the $name is of: + * one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * Defaults to BasePeer::TYPE_PHPNAME + * @return mixed Value of field. + */ + public function getByName($name, $type = BasePeer::TYPE_PHPNAME) + { + $pos = ThirdPartyTrackReferencesPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + $field = $this->getByPosition($pos); + + return $field; + } + + /** + * Retrieves a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @return mixed Value of field at $pos + */ + public function getByPosition($pos) + { + switch ($pos) { + case 0: + return $this->getDbId(); + break; + case 1: + return $this->getDbService(); + break; + case 2: + return $this->getDbForeignId(); + break; + case 3: + return $this->getDbFileId(); + break; + case 4: + return $this->getDbUploadTime(); + break; + case 5: + return $this->getDbStatus(); + break; + default: + return null; + break; + } // switch() + } + + /** + * Exports the object as an array. + * + * You can specify the key type of the array by passing one of the class + * type constants. + * + * @param string $keyType (optional) One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * Defaults to BasePeer::TYPE_PHPNAME. + * @param boolean $includeLazyLoadColumns (optional) Whether to include lazy loaded columns. Defaults to true. + * @param array $alreadyDumpedObjects List of objects to skip to avoid recursion + * @param boolean $includeForeignObjects (optional) Whether to include hydrated related objects. Default to FALSE. + * + * @return array an associative array containing the field names (as keys) and field values + */ + public function toArray($keyType = BasePeer::TYPE_PHPNAME, $includeLazyLoadColumns = true, $alreadyDumpedObjects = array(), $includeForeignObjects = false) + { + if (isset($alreadyDumpedObjects['ThirdPartyTrackReferences'][$this->getPrimaryKey()])) { + return '*RECURSION*'; + } + $alreadyDumpedObjects['ThirdPartyTrackReferences'][$this->getPrimaryKey()] = true; + $keys = ThirdPartyTrackReferencesPeer::getFieldNames($keyType); + $result = array( + $keys[0] => $this->getDbId(), + $keys[1] => $this->getDbService(), + $keys[2] => $this->getDbForeignId(), + $keys[3] => $this->getDbFileId(), + $keys[4] => $this->getDbUploadTime(), + $keys[5] => $this->getDbStatus(), + ); + $virtualColumns = $this->virtualColumns; + foreach ($virtualColumns as $key => $virtualColumn) { + $result[$key] = $virtualColumn; + } + + if ($includeForeignObjects) { + if (null !== $this->aCcFiles) { + $result['CcFiles'] = $this->aCcFiles->toArray($keyType, $includeLazyLoadColumns, $alreadyDumpedObjects, true); + } + if (null !== $this->collCeleryTaskss) { + $result['CeleryTaskss'] = $this->collCeleryTaskss->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } + } + + return $result; + } + + /** + * Sets a field from the object by name passed in as a string. + * + * @param string $name peer name + * @param mixed $value field value + * @param string $type The type of fieldname the $name is of: + * one of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * Defaults to BasePeer::TYPE_PHPNAME + * @return void + */ + public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME) + { + $pos = ThirdPartyTrackReferencesPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM); + + $this->setByPosition($pos, $value); + } + + /** + * Sets a field from the object by Position as specified in the xml schema. + * Zero-based. + * + * @param int $pos position in xml schema + * @param mixed $value field value + * @return void + */ + public function setByPosition($pos, $value) + { + switch ($pos) { + case 0: + $this->setDbId($value); + break; + case 1: + $this->setDbService($value); + break; + case 2: + $this->setDbForeignId($value); + break; + case 3: + $this->setDbFileId($value); + break; + case 4: + $this->setDbUploadTime($value); + break; + case 5: + $this->setDbStatus($value); + break; + } // switch() + } + + /** + * Populates the object using an array. + * + * This is particularly useful when populating an object from one of the + * request arrays (e.g. $_POST). This method goes through the column + * names, checking to see whether a matching key exists in populated + * array. If so the setByName() method is called for that column. + * + * You can specify the key type of the array by additionally passing one + * of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. + * The default key type is the column's BasePeer::TYPE_PHPNAME + * + * @param array $arr An array to populate the object from. + * @param string $keyType The type of keys the array uses. + * @return void + */ + public function fromArray($arr, $keyType = BasePeer::TYPE_PHPNAME) + { + $keys = ThirdPartyTrackReferencesPeer::getFieldNames($keyType); + + if (array_key_exists($keys[0], $arr)) $this->setDbId($arr[$keys[0]]); + if (array_key_exists($keys[1], $arr)) $this->setDbService($arr[$keys[1]]); + if (array_key_exists($keys[2], $arr)) $this->setDbForeignId($arr[$keys[2]]); + if (array_key_exists($keys[3], $arr)) $this->setDbFileId($arr[$keys[3]]); + if (array_key_exists($keys[4], $arr)) $this->setDbUploadTime($arr[$keys[4]]); + if (array_key_exists($keys[5], $arr)) $this->setDbStatus($arr[$keys[5]]); + } + + /** + * Build a Criteria object containing the values of all modified columns in this object. + * + * @return Criteria The Criteria object containing all modified values. + */ + public function buildCriteria() + { + $criteria = new Criteria(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::ID)) $criteria->add(ThirdPartyTrackReferencesPeer::ID, $this->id); + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::SERVICE)) $criteria->add(ThirdPartyTrackReferencesPeer::SERVICE, $this->service); + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::FOREIGN_ID)) $criteria->add(ThirdPartyTrackReferencesPeer::FOREIGN_ID, $this->foreign_id); + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::FILE_ID)) $criteria->add(ThirdPartyTrackReferencesPeer::FILE_ID, $this->file_id); + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::UPLOAD_TIME)) $criteria->add(ThirdPartyTrackReferencesPeer::UPLOAD_TIME, $this->upload_time); + if ($this->isColumnModified(ThirdPartyTrackReferencesPeer::STATUS)) $criteria->add(ThirdPartyTrackReferencesPeer::STATUS, $this->status); + + return $criteria; + } + + /** + * Builds a Criteria object containing the primary key for this object. + * + * Unlike buildCriteria() this method includes the primary key values regardless + * of whether or not they have been modified. + * + * @return Criteria The Criteria object containing value(s) for primary key(s). + */ + public function buildPkeyCriteria() + { + $criteria = new Criteria(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + $criteria->add(ThirdPartyTrackReferencesPeer::ID, $this->id); + + return $criteria; + } + + /** + * Returns the primary key for this object (row). + * @return int + */ + public function getPrimaryKey() + { + return $this->getDbId(); + } + + /** + * Generic method to set the primary key (id column). + * + * @param int $key Primary key. + * @return void + */ + public function setPrimaryKey($key) + { + $this->setDbId($key); + } + + /** + * Returns true if the primary key for this object is null. + * @return boolean + */ + public function isPrimaryKeyNull() + { + + return null === $this->getDbId(); + } + + /** + * Sets contents of passed object to values from current object. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param object $copyObj An object of ThirdPartyTrackReferences (or compatible) type. + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @param boolean $makeNew Whether to reset autoincrement PKs and make the object new. + * @throws PropelException + */ + public function copyInto($copyObj, $deepCopy = false, $makeNew = true) + { + $copyObj->setDbService($this->getDbService()); + $copyObj->setDbForeignId($this->getDbForeignId()); + $copyObj->setDbFileId($this->getDbFileId()); + $copyObj->setDbUploadTime($this->getDbUploadTime()); + $copyObj->setDbStatus($this->getDbStatus()); + + if ($deepCopy && !$this->startCopy) { + // important: temporarily setNew(false) because this affects the behavior of + // the getter/setter methods for fkey referrer objects. + $copyObj->setNew(false); + // store object hash to prevent cycle + $this->startCopy = true; + + foreach ($this->getCeleryTaskss() as $relObj) { + if ($relObj !== $this) { // ensure that we don't try to copy a reference to ourselves + $copyObj->addCeleryTasks($relObj->copy($deepCopy)); + } + } + + //unflag object copy + $this->startCopy = false; + } // if ($deepCopy) + + if ($makeNew) { + $copyObj->setNew(true); + $copyObj->setDbId(NULL); // this is a auto-increment column, so set to default value + } + } + + /** + * Makes a copy of this object that will be inserted as a new row in table when saved. + * It creates a new object filling in the simple attributes, but skipping any primary + * keys that are defined for the table. + * + * If desired, this method can also make copies of all associated (fkey referrers) + * objects. + * + * @param boolean $deepCopy Whether to also copy all rows that refer (by fkey) to the current row. + * @return ThirdPartyTrackReferences Clone of current object. + * @throws PropelException + */ + public function copy($deepCopy = false) + { + // we use get_class(), because this might be a subclass + $clazz = get_class($this); + $copyObj = new $clazz(); + $this->copyInto($copyObj, $deepCopy); + + return $copyObj; + } + + /** + * Returns a peer instance associated with this om. + * + * Since Peer classes are not to have any instance attributes, this method returns the + * same instance for all member of this class. The method could therefore + * be static, but this would prevent one from overriding the behavior. + * + * @return ThirdPartyTrackReferencesPeer + */ + public function getPeer() + { + if (self::$peer === null) { + self::$peer = new ThirdPartyTrackReferencesPeer(); + } + + return self::$peer; + } + + /** + * Declares an association between this object and a CcFiles object. + * + * @param CcFiles $v + * @return ThirdPartyTrackReferences The current object (for fluent API support) + * @throws PropelException + */ + public function setCcFiles(CcFiles $v = null) + { + if ($v === null) { + $this->setDbFileId(NULL); + } else { + $this->setDbFileId($v->getDbId()); + } + + $this->aCcFiles = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the CcFiles object, it will not be re-added. + if ($v !== null) { + $v->addThirdPartyTrackReferences($this); + } + + + return $this; + } + + + /** + * Get the associated CcFiles object + * + * @param PropelPDO $con Optional Connection object. + * @param $doQuery Executes a query to get the object if required + * @return CcFiles The associated CcFiles object. + * @throws PropelException + */ + public function getCcFiles(PropelPDO $con = null, $doQuery = true) + { + if ($this->aCcFiles === null && ($this->file_id !== null) && $doQuery) { + $this->aCcFiles = CcFilesQuery::create()->findPk($this->file_id, $con); + /* The following can be used additionally to + guarantee the related object contains a reference + to this object. This level of coupling may, however, be + undesirable since it could result in an only partially populated collection + in the referenced object. + $this->aCcFiles->addThirdPartyTrackReferencess($this); + */ + } + + return $this->aCcFiles; + } + + + /** + * Initializes a collection based on the name of a relation. + * Avoids crafting an 'init[$relationName]s' method name + * that wouldn't work when StandardEnglishPluralizer is used. + * + * @param string $relationName The name of the relation to initialize + * @return void + */ + public function initRelation($relationName) + { + if ('CeleryTasks' == $relationName) { + $this->initCeleryTaskss(); + } + } + + /** + * Clears out the collCeleryTaskss collection + * + * This does not modify the database; however, it will remove any associated objects, causing + * them to be refetched by subsequent calls to accessor method. + * + * @return ThirdPartyTrackReferences The current object (for fluent API support) + * @see addCeleryTaskss() + */ + public function clearCeleryTaskss() + { + $this->collCeleryTaskss = null; // important to set this to null since that means it is uninitialized + $this->collCeleryTaskssPartial = null; + + return $this; + } + + /** + * reset is the collCeleryTaskss collection loaded partially + * + * @return void + */ + public function resetPartialCeleryTaskss($v = true) + { + $this->collCeleryTaskssPartial = $v; + } + + /** + * Initializes the collCeleryTaskss collection. + * + * By default this just sets the collCeleryTaskss collection to an empty array (like clearcollCeleryTaskss()); + * however, you may wish to override this method in your stub class to provide setting appropriate + * to your application -- for example, setting the initial array to the values stored in database. + * + * @param boolean $overrideExisting If set to true, the method call initializes + * the collection even if it is not empty + * + * @return void + */ + public function initCeleryTaskss($overrideExisting = true) + { + if (null !== $this->collCeleryTaskss && !$overrideExisting) { + return; + } + $this->collCeleryTaskss = new PropelObjectCollection(); + $this->collCeleryTaskss->setModel('CeleryTasks'); + } + + /** + * Gets an array of CeleryTasks objects which contain a foreign key that references this object. + * + * If the $criteria is not null, it is used to always fetch the results from the database. + * Otherwise the results are fetched from the database the first time, then cached. + * Next time the same method is called without $criteria, the cached collection is returned. + * If this ThirdPartyTrackReferences is new, it will return + * an empty collection or the current collection; the criteria is ignored on a new object. + * + * @param Criteria $criteria optional Criteria object to narrow the query + * @param PropelPDO $con optional connection object + * @return PropelObjectCollection|CeleryTasks[] List of CeleryTasks objects + * @throws PropelException + */ + public function getCeleryTaskss($criteria = null, PropelPDO $con = null) + { + $partial = $this->collCeleryTaskssPartial && !$this->isNew(); + if (null === $this->collCeleryTaskss || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCeleryTaskss) { + // return empty collection + $this->initCeleryTaskss(); + } else { + $collCeleryTaskss = CeleryTasksQuery::create(null, $criteria) + ->filterByThirdPartyTrackReferences($this) + ->find($con); + if (null !== $criteria) { + if (false !== $this->collCeleryTaskssPartial && count($collCeleryTaskss)) { + $this->initCeleryTaskss(false); + + foreach ($collCeleryTaskss as $obj) { + if (false == $this->collCeleryTaskss->contains($obj)) { + $this->collCeleryTaskss->append($obj); + } + } + + $this->collCeleryTaskssPartial = true; + } + + $collCeleryTaskss->getInternalIterator()->rewind(); + + return $collCeleryTaskss; + } + + if ($partial && $this->collCeleryTaskss) { + foreach ($this->collCeleryTaskss as $obj) { + if ($obj->isNew()) { + $collCeleryTaskss[] = $obj; + } + } + } + + $this->collCeleryTaskss = $collCeleryTaskss; + $this->collCeleryTaskssPartial = false; + } + } + + return $this->collCeleryTaskss; + } + + /** + * Sets a collection of CeleryTasks objects related by a one-to-many relationship + * to the current object. + * It will also schedule objects for deletion based on a diff between old objects (aka persisted) + * and new objects from the given Propel collection. + * + * @param PropelCollection $celeryTaskss A Propel collection. + * @param PropelPDO $con Optional connection object + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setCeleryTaskss(PropelCollection $celeryTaskss, PropelPDO $con = null) + { + $celeryTaskssToDelete = $this->getCeleryTaskss(new Criteria(), $con)->diff($celeryTaskss); + + + $this->celeryTaskssScheduledForDeletion = $celeryTaskssToDelete; + + foreach ($celeryTaskssToDelete as $celeryTasksRemoved) { + $celeryTasksRemoved->setThirdPartyTrackReferences(null); + } + + $this->collCeleryTaskss = null; + foreach ($celeryTaskss as $celeryTasks) { + $this->addCeleryTasks($celeryTasks); + } + + $this->collCeleryTaskss = $celeryTaskss; + $this->collCeleryTaskssPartial = false; + + return $this; + } + + /** + * Returns the number of related CeleryTasks objects. + * + * @param Criteria $criteria + * @param boolean $distinct + * @param PropelPDO $con + * @return int Count of related CeleryTasks objects. + * @throws PropelException + */ + public function countCeleryTaskss(Criteria $criteria = null, $distinct = false, PropelPDO $con = null) + { + $partial = $this->collCeleryTaskssPartial && !$this->isNew(); + if (null === $this->collCeleryTaskss || null !== $criteria || $partial) { + if ($this->isNew() && null === $this->collCeleryTaskss) { + return 0; + } + + if ($partial && !$criteria) { + return count($this->getCeleryTaskss()); + } + $query = CeleryTasksQuery::create(null, $criteria); + if ($distinct) { + $query->distinct(); + } + + return $query + ->filterByThirdPartyTrackReferences($this) + ->count($con); + } + + return count($this->collCeleryTaskss); + } + + /** + * Method called to associate a CeleryTasks object to this object + * through the CeleryTasks foreign key attribute. + * + * @param CeleryTasks $l CeleryTasks + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function addCeleryTasks(CeleryTasks $l) + { + if ($this->collCeleryTaskss === null) { + $this->initCeleryTaskss(); + $this->collCeleryTaskssPartial = true; + } + + if (!in_array($l, $this->collCeleryTaskss->getArrayCopy(), true)) { // only add it if the **same** object is not already associated + $this->doAddCeleryTasks($l); + + if ($this->celeryTaskssScheduledForDeletion and $this->celeryTaskssScheduledForDeletion->contains($l)) { + $this->celeryTaskssScheduledForDeletion->remove($this->celeryTaskssScheduledForDeletion->search($l)); + } + } + + return $this; + } + + /** + * @param CeleryTasks $celeryTasks The celeryTasks object to add. + */ + protected function doAddCeleryTasks($celeryTasks) + { + $this->collCeleryTaskss[]= $celeryTasks; + $celeryTasks->setThirdPartyTrackReferences($this); + } + + /** + * @param CeleryTasks $celeryTasks The celeryTasks object to remove. + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function removeCeleryTasks($celeryTasks) + { + if ($this->getCeleryTaskss()->contains($celeryTasks)) { + $this->collCeleryTaskss->remove($this->collCeleryTaskss->search($celeryTasks)); + if (null === $this->celeryTaskssScheduledForDeletion) { + $this->celeryTaskssScheduledForDeletion = clone $this->collCeleryTaskss; + $this->celeryTaskssScheduledForDeletion->clear(); + } + $this->celeryTaskssScheduledForDeletion[]= clone $celeryTasks; + $celeryTasks->setThirdPartyTrackReferences(null); + } + + return $this; + } + + /** + * Clears the current object and sets all attributes to their default values + */ + public function clear() + { + $this->id = null; + $this->service = null; + $this->foreign_id = null; + $this->file_id = null; + $this->upload_time = null; + $this->status = null; + $this->alreadyInSave = false; + $this->alreadyInValidation = false; + $this->alreadyInClearAllReferencesDeep = false; + $this->clearAllReferences(); + $this->resetModified(); + $this->setNew(true); + $this->setDeleted(false); + } + + /** + * Resets all references to other model objects or collections of model objects. + * + * This method is a user-space workaround for PHP's inability to garbage collect + * objects with circular references (even in PHP 5.3). This is currently necessary + * when using Propel in certain daemon or large-volume/high-memory operations. + * + * @param boolean $deep Whether to also clear the references on all referrer objects. + */ + public function clearAllReferences($deep = false) + { + if ($deep && !$this->alreadyInClearAllReferencesDeep) { + $this->alreadyInClearAllReferencesDeep = true; + if ($this->collCeleryTaskss) { + foreach ($this->collCeleryTaskss as $o) { + $o->clearAllReferences($deep); + } + } + if ($this->aCcFiles instanceof Persistent) { + $this->aCcFiles->clearAllReferences($deep); + } + + $this->alreadyInClearAllReferencesDeep = false; + } // if ($deep) + + if ($this->collCeleryTaskss instanceof PropelCollection) { + $this->collCeleryTaskss->clearIterator(); + } + $this->collCeleryTaskss = null; + $this->aCcFiles = null; + } + + /** + * return the string representation of this object + * + * @return string + */ + public function __toString() + { + return (string) $this->exportTo(ThirdPartyTrackReferencesPeer::DEFAULT_STRING_FORMAT); + } + + /** + * return true is the object is in saving state + * + * @return boolean + */ + public function isAlreadyInSave() + { + return $this->alreadyInSave; + } + +} diff --git a/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php new file mode 100644 index 000000000..38c8ddbd9 --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php @@ -0,0 +1,1022 @@ + array ('DbId', 'DbService', 'DbForeignId', 'DbFileId', 'DbUploadTime', 'DbStatus', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbService', 'dbForeignId', 'dbFileId', 'dbUploadTime', 'dbStatus', ), + BasePeer::TYPE_COLNAME => array (ThirdPartyTrackReferencesPeer::ID, ThirdPartyTrackReferencesPeer::SERVICE, ThirdPartyTrackReferencesPeer::FOREIGN_ID, ThirdPartyTrackReferencesPeer::FILE_ID, ThirdPartyTrackReferencesPeer::UPLOAD_TIME, ThirdPartyTrackReferencesPeer::STATUS, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID', 'SERVICE', 'FOREIGN_ID', 'FILE_ID', 'UPLOAD_TIME', 'STATUS', ), + BasePeer::TYPE_FIELDNAME => array ('id', 'service', 'foreign_id', 'file_id', 'upload_time', 'status', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + ); + + /** + * holds an array of keys for quick access to the fieldnames array + * + * first dimension keys are the type constants + * e.g. ThirdPartyTrackReferencesPeer::$fieldNames[BasePeer::TYPE_PHPNAME]['Id'] = 0 + */ + protected static $fieldKeys = array ( + BasePeer::TYPE_PHPNAME => array ('DbId' => 0, 'DbService' => 1, 'DbForeignId' => 2, 'DbFileId' => 3, 'DbUploadTime' => 4, 'DbStatus' => 5, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbService' => 1, 'dbForeignId' => 2, 'dbFileId' => 3, 'dbUploadTime' => 4, 'dbStatus' => 5, ), + BasePeer::TYPE_COLNAME => array (ThirdPartyTrackReferencesPeer::ID => 0, ThirdPartyTrackReferencesPeer::SERVICE => 1, ThirdPartyTrackReferencesPeer::FOREIGN_ID => 2, ThirdPartyTrackReferencesPeer::FILE_ID => 3, ThirdPartyTrackReferencesPeer::UPLOAD_TIME => 4, ThirdPartyTrackReferencesPeer::STATUS => 5, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'SERVICE' => 1, 'FOREIGN_ID' => 2, 'FILE_ID' => 3, 'UPLOAD_TIME' => 4, 'STATUS' => 5, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'service' => 1, 'foreign_id' => 2, 'file_id' => 3, 'upload_time' => 4, 'status' => 5, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, 5, ) + ); + + /** + * Translates a fieldname to another type + * + * @param string $name field name + * @param string $fromType One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM + * @param string $toType One of the class type constants + * @return string translated name of the field. + * @throws PropelException - if the specified name could not be found in the fieldname mappings. + */ + public static function translateFieldName($name, $fromType, $toType) + { + $toNames = ThirdPartyTrackReferencesPeer::getFieldNames($toType); + $key = isset(ThirdPartyTrackReferencesPeer::$fieldKeys[$fromType][$name]) ? ThirdPartyTrackReferencesPeer::$fieldKeys[$fromType][$name] : null; + if ($key === null) { + throw new PropelException("'$name' could not be found in the field names of type '$fromType'. These are: " . print_r(ThirdPartyTrackReferencesPeer::$fieldKeys[$fromType], true)); + } + + return $toNames[$key]; + } + + /** + * Returns an array of field names. + * + * @param string $type The type of fieldnames to return: + * One of the class type constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME + * BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM + * @return array A list of field names + * @throws PropelException - if the type is not valid. + */ + public static function getFieldNames($type = BasePeer::TYPE_PHPNAME) + { + if (!array_key_exists($type, ThirdPartyTrackReferencesPeer::$fieldNames)) { + throw new PropelException('Method getFieldNames() expects the parameter $type to be one of the class constants BasePeer::TYPE_PHPNAME, BasePeer::TYPE_STUDLYPHPNAME, BasePeer::TYPE_COLNAME, BasePeer::TYPE_FIELDNAME, BasePeer::TYPE_NUM. ' . $type . ' was given.'); + } + + return ThirdPartyTrackReferencesPeer::$fieldNames[$type]; + } + + /** + * Convenience method which changes table.column to alias.column. + * + * Using this method you can maintain SQL abstraction while using column aliases. + * + * $c->addAlias("alias1", TablePeer::TABLE_NAME); + * $c->addJoin(TablePeer::alias("alias1", TablePeer::PRIMARY_KEY_COLUMN), TablePeer::PRIMARY_KEY_COLUMN); + * + * @param string $alias The alias for the current table. + * @param string $column The column name for current table. (i.e. ThirdPartyTrackReferencesPeer::COLUMN_NAME). + * @return string + */ + public static function alias($alias, $column) + { + return str_replace(ThirdPartyTrackReferencesPeer::TABLE_NAME.'.', $alias.'.', $column); + } + + /** + * Add all the columns needed to create a new object. + * + * Note: any columns that were marked with lazyLoad="true" in the + * XML schema will not be added to the select list and only loaded + * on demand. + * + * @param Criteria $criteria object containing the columns to add. + * @param string $alias optional table alias + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function addSelectColumns(Criteria $criteria, $alias = null) + { + if (null === $alias) { + $criteria->addSelectColumn(ThirdPartyTrackReferencesPeer::ID); + $criteria->addSelectColumn(ThirdPartyTrackReferencesPeer::SERVICE); + $criteria->addSelectColumn(ThirdPartyTrackReferencesPeer::FOREIGN_ID); + $criteria->addSelectColumn(ThirdPartyTrackReferencesPeer::FILE_ID); + $criteria->addSelectColumn(ThirdPartyTrackReferencesPeer::UPLOAD_TIME); + $criteria->addSelectColumn(ThirdPartyTrackReferencesPeer::STATUS); + } else { + $criteria->addSelectColumn($alias . '.id'); + $criteria->addSelectColumn($alias . '.service'); + $criteria->addSelectColumn($alias . '.foreign_id'); + $criteria->addSelectColumn($alias . '.file_id'); + $criteria->addSelectColumn($alias . '.upload_time'); + $criteria->addSelectColumn($alias . '.status'); + } + } + + /** + * Returns the number of rows matching criteria. + * + * @param Criteria $criteria + * @param boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead. + * @param PropelPDO $con + * @return int Number of matching rows. + */ + public static function doCount(Criteria $criteria, $distinct = false, PropelPDO $con = null) + { + // we may modify criteria, so copy it first + $criteria = clone $criteria; + + // We need to set the primary table name, since in the case that there are no WHERE columns + // it will be impossible for the BasePeer::createSelectSql() method to determine which + // tables go into the FROM clause. + $criteria->setPrimaryTableName(ThirdPartyTrackReferencesPeer::TABLE_NAME); + + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->setDistinct(); + } + + if (!$criteria->hasSelectClause()) { + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + } + + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); // Set the correct dbName + + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + // BasePeer returns a PDOStatement + $stmt = BasePeer::doCount($criteria, $con); + + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $count = (int) $row[0]; + } else { + $count = 0; // no rows returned; we infer that means 0 matches. + } + $stmt->closeCursor(); + + return $count; + } + /** + * Selects one object from the DB. + * + * @param Criteria $criteria object used to create the SELECT statement. + * @param PropelPDO $con + * @return ThirdPartyTrackReferences + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelectOne(Criteria $criteria, PropelPDO $con = null) + { + $critcopy = clone $criteria; + $critcopy->setLimit(1); + $objects = ThirdPartyTrackReferencesPeer::doSelect($critcopy, $con); + if ($objects) { + return $objects[0]; + } + + return null; + } + /** + * Selects several row from the DB. + * + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param PropelPDO $con + * @return array Array of selected Objects + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelect(Criteria $criteria, PropelPDO $con = null) + { + return ThirdPartyTrackReferencesPeer::populateObjects(ThirdPartyTrackReferencesPeer::doSelectStmt($criteria, $con)); + } + /** + * Prepares the Criteria object and uses the parent doSelect() method to execute a PDOStatement. + * + * Use this method directly if you want to work with an executed statement directly (for example + * to perform your own object hydration). + * + * @param Criteria $criteria The Criteria object used to build the SELECT statement. + * @param PropelPDO $con The connection to use + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return PDOStatement The executed PDOStatement object. + * @see BasePeer::doSelect() + */ + public static function doSelectStmt(Criteria $criteria, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + if (!$criteria->hasSelectClause()) { + $criteria = clone $criteria; + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + } + + // Set the correct dbName + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + // BasePeer returns a PDOStatement + return BasePeer::doSelect($criteria, $con); + } + /** + * Adds an object to the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases -- especially when you override doSelect*() + * methods in your stub classes -- you may need to explicitly add objects + * to the cache in order to ensure that the same objects are always returned by doSelect*() + * and retrieveByPK*() calls. + * + * @param ThirdPartyTrackReferences $obj A ThirdPartyTrackReferences object. + * @param string $key (optional) key to use for instance map (for performance boost if key was already calculated externally). + */ + public static function addInstanceToPool($obj, $key = null) + { + if (Propel::isInstancePoolingEnabled()) { + if ($key === null) { + $key = (string) $obj->getDbId(); + } // if key === null + ThirdPartyTrackReferencesPeer::$instances[$key] = $obj; + } + } + + /** + * Removes an object from the instance pool. + * + * Propel keeps cached copies of objects in an instance pool when they are retrieved + * from the database. In some cases -- especially when you override doDelete + * methods in your stub classes -- you may need to explicitly remove objects + * from the cache in order to prevent returning objects that no longer exist. + * + * @param mixed $value A ThirdPartyTrackReferences object or a primary key value. + * + * @return void + * @throws PropelException - if the value is invalid. + */ + public static function removeInstanceFromPool($value) + { + if (Propel::isInstancePoolingEnabled() && $value !== null) { + if (is_object($value) && $value instanceof ThirdPartyTrackReferences) { + $key = (string) $value->getDbId(); + } elseif (is_scalar($value)) { + // assume we've been passed a primary key + $key = (string) $value; + } else { + $e = new PropelException("Invalid value passed to removeInstanceFromPool(). Expected primary key or ThirdPartyTrackReferences object; got " . (is_object($value) ? get_class($value) . ' object.' : var_export($value,true))); + throw $e; + } + + unset(ThirdPartyTrackReferencesPeer::$instances[$key]); + } + } // removeInstanceFromPool() + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param string $key The key (@see getPrimaryKeyHash()) for this instance. + * @return ThirdPartyTrackReferences Found object or null if 1) no instance exists for specified key or 2) instance pooling has been disabled. + * @see getPrimaryKeyHash() + */ + public static function getInstanceFromPool($key) + { + if (Propel::isInstancePoolingEnabled()) { + if (isset(ThirdPartyTrackReferencesPeer::$instances[$key])) { + return ThirdPartyTrackReferencesPeer::$instances[$key]; + } + } + + return null; // just to be explicit + } + + /** + * Clear the instance pool. + * + * @return void + */ + public static function clearInstancePool($and_clear_all_references = false) + { + if ($and_clear_all_references) { + foreach (ThirdPartyTrackReferencesPeer::$instances as $instance) { + $instance->clearAllReferences(true); + } + } + ThirdPartyTrackReferencesPeer::$instances = array(); + } + + /** + * Method to invalidate the instance pool of all tables related to third_party_track_references + * by a foreign key with ON DELETE CASCADE + */ + public static function clearRelatedInstancePool() + { + // Invalidate objects in CeleryTasksPeer instance pool, + // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. + CeleryTasksPeer::clearInstancePool(); + } + + /** + * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table. + * + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, a serialize()d version of the primary key will be returned. + * + * @param array $row PropelPDO resultset row. + * @param int $startcol The 0-based offset for reading from the resultset row. + * @return string A string version of PK or null if the components of primary key in result array are all null. + */ + public static function getPrimaryKeyHashFromRow($row, $startcol = 0) + { + // If the PK cannot be derived from the row, return null. + if ($row[$startcol] === null) { + return null; + } + + return (string) $row[$startcol]; + } + + /** + * Retrieves the primary key from the DB resultset row + * For tables with a single-column primary key, that simple pkey value will be returned. For tables with + * a multi-column primary key, an array of the primary key columns will be returned. + * + * @param array $row PropelPDO resultset row. + * @param int $startcol The 0-based offset for reading from the resultset row. + * @return mixed The primary key of the row + */ + public static function getPrimaryKeyFromRow($row, $startcol = 0) + { + + return (int) $row[$startcol]; + } + + /** + * The returned array will contain objects of the default type or + * objects that inherit from the default. + * + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function populateObjects(PDOStatement $stmt) + { + $results = array(); + + // set the class once to avoid overhead in the loop + $cls = ThirdPartyTrackReferencesPeer::getOMClass(); + // populate the object(s) + while ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $key = ThirdPartyTrackReferencesPeer::getPrimaryKeyHashFromRow($row, 0); + if (null !== ($obj = ThirdPartyTrackReferencesPeer::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, 0, true); // rehydrate + $results[] = $obj; + } else { + $obj = new $cls(); + $obj->hydrate($row); + $results[] = $obj; + ThirdPartyTrackReferencesPeer::addInstanceToPool($obj, $key); + } // if key exists + } + $stmt->closeCursor(); + + return $results; + } + /** + * Populates an object of the default type or an object that inherit from the default. + * + * @param array $row PropelPDO resultset row. + * @param int $startcol The 0-based offset for reading from the resultset row. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + * @return array (ThirdPartyTrackReferences object, last column rank) + */ + public static function populateObject($row, $startcol = 0) + { + $key = ThirdPartyTrackReferencesPeer::getPrimaryKeyHashFromRow($row, $startcol); + if (null !== ($obj = ThirdPartyTrackReferencesPeer::getInstanceFromPool($key))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj->hydrate($row, $startcol, true); // rehydrate + $col = $startcol + ThirdPartyTrackReferencesPeer::NUM_HYDRATE_COLUMNS; + } else { + $cls = ThirdPartyTrackReferencesPeer::OM_CLASS; + $obj = new $cls(); + $col = $obj->hydrate($row, $startcol); + ThirdPartyTrackReferencesPeer::addInstanceToPool($obj, $key); + } + + return array($obj, $col); + } + + + /** + * Returns the number of rows matching criteria, joining the related CcFiles table + * + * @param Criteria $criteria + * @param boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead. + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return int Number of matching rows. + */ + public static function doCountJoinCcFiles(Criteria $criteria, $distinct = false, PropelPDO $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + // we're going to modify criteria, so copy it first + $criteria = clone $criteria; + + // We need to set the primary table name, since in the case that there are no WHERE columns + // it will be impossible for the BasePeer::createSelectSql() method to determine which + // tables go into the FROM clause. + $criteria->setPrimaryTableName(ThirdPartyTrackReferencesPeer::TABLE_NAME); + + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->setDistinct(); + } + + if (!$criteria->hasSelectClause()) { + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + } + + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count + + // Set the correct dbName + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $criteria->addJoin(ThirdPartyTrackReferencesPeer::FILE_ID, CcFilesPeer::ID, $join_behavior); + + $stmt = BasePeer::doCount($criteria, $con); + + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $count = (int) $row[0]; + } else { + $count = 0; // no rows returned; we infer that means 0 matches. + } + $stmt->closeCursor(); + + return $count; + } + + + /** + * Selects a collection of ThirdPartyTrackReferences objects pre-filled with their CcFiles objects. + * @param Criteria $criteria + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return array Array of ThirdPartyTrackReferences objects. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelectJoinCcFiles(Criteria $criteria, $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + $criteria = clone $criteria; + + // Set the correct dbName if it has not been overridden + if ($criteria->getDbName() == Propel::getDefaultDB()) { + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + } + + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + $startcol = ThirdPartyTrackReferencesPeer::NUM_HYDRATE_COLUMNS; + CcFilesPeer::addSelectColumns($criteria); + + $criteria->addJoin(ThirdPartyTrackReferencesPeer::FILE_ID, CcFilesPeer::ID, $join_behavior); + + $stmt = BasePeer::doSelect($criteria, $con); + $results = array(); + + while ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $key1 = ThirdPartyTrackReferencesPeer::getPrimaryKeyHashFromRow($row, 0); + if (null !== ($obj1 = ThirdPartyTrackReferencesPeer::getInstanceFromPool($key1))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj1->hydrate($row, 0, true); // rehydrate + } else { + + $cls = ThirdPartyTrackReferencesPeer::getOMClass(); + + $obj1 = new $cls(); + $obj1->hydrate($row); + ThirdPartyTrackReferencesPeer::addInstanceToPool($obj1, $key1); + } // if $obj1 already loaded + + $key2 = CcFilesPeer::getPrimaryKeyHashFromRow($row, $startcol); + if ($key2 !== null) { + $obj2 = CcFilesPeer::getInstanceFromPool($key2); + if (!$obj2) { + + $cls = CcFilesPeer::getOMClass(); + + $obj2 = new $cls(); + $obj2->hydrate($row, $startcol); + CcFilesPeer::addInstanceToPool($obj2, $key2); + } // if obj2 already loaded + + // Add the $obj1 (ThirdPartyTrackReferences) to $obj2 (CcFiles) + $obj2->addThirdPartyTrackReferences($obj1); + + } // if joined row was not null + + $results[] = $obj1; + } + $stmt->closeCursor(); + + return $results; + } + + + /** + * Returns the number of rows matching criteria, joining all related tables + * + * @param Criteria $criteria + * @param boolean $distinct Whether to select only distinct columns; deprecated: use Criteria->setDistinct() instead. + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return int Number of matching rows. + */ + public static function doCountJoinAll(Criteria $criteria, $distinct = false, PropelPDO $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + // we're going to modify criteria, so copy it first + $criteria = clone $criteria; + + // We need to set the primary table name, since in the case that there are no WHERE columns + // it will be impossible for the BasePeer::createSelectSql() method to determine which + // tables go into the FROM clause. + $criteria->setPrimaryTableName(ThirdPartyTrackReferencesPeer::TABLE_NAME); + + if ($distinct && !in_array(Criteria::DISTINCT, $criteria->getSelectModifiers())) { + $criteria->setDistinct(); + } + + if (!$criteria->hasSelectClause()) { + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + } + + $criteria->clearOrderByColumns(); // ORDER BY won't ever affect the count + + // Set the correct dbName + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $criteria->addJoin(ThirdPartyTrackReferencesPeer::FILE_ID, CcFilesPeer::ID, $join_behavior); + + $stmt = BasePeer::doCount($criteria, $con); + + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $count = (int) $row[0]; + } else { + $count = 0; // no rows returned; we infer that means 0 matches. + } + $stmt->closeCursor(); + + return $count; + } + + /** + * Selects a collection of ThirdPartyTrackReferences objects pre-filled with all related objects. + * + * @param Criteria $criteria + * @param PropelPDO $con + * @param String $join_behavior the type of joins to use, defaults to Criteria::LEFT_JOIN + * @return array Array of ThirdPartyTrackReferences objects. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doSelectJoinAll(Criteria $criteria, $con = null, $join_behavior = Criteria::LEFT_JOIN) + { + $criteria = clone $criteria; + + // Set the correct dbName if it has not been overridden + if ($criteria->getDbName() == Propel::getDefaultDB()) { + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + } + + ThirdPartyTrackReferencesPeer::addSelectColumns($criteria); + $startcol2 = ThirdPartyTrackReferencesPeer::NUM_HYDRATE_COLUMNS; + + CcFilesPeer::addSelectColumns($criteria); + $startcol3 = $startcol2 + CcFilesPeer::NUM_HYDRATE_COLUMNS; + + $criteria->addJoin(ThirdPartyTrackReferencesPeer::FILE_ID, CcFilesPeer::ID, $join_behavior); + + $stmt = BasePeer::doSelect($criteria, $con); + $results = array(); + + while ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $key1 = ThirdPartyTrackReferencesPeer::getPrimaryKeyHashFromRow($row, 0); + if (null !== ($obj1 = ThirdPartyTrackReferencesPeer::getInstanceFromPool($key1))) { + // We no longer rehydrate the object, since this can cause data loss. + // See http://www.propelorm.org/ticket/509 + // $obj1->hydrate($row, 0, true); // rehydrate + } else { + $cls = ThirdPartyTrackReferencesPeer::getOMClass(); + + $obj1 = new $cls(); + $obj1->hydrate($row); + ThirdPartyTrackReferencesPeer::addInstanceToPool($obj1, $key1); + } // if obj1 already loaded + + // Add objects for joined CcFiles rows + + $key2 = CcFilesPeer::getPrimaryKeyHashFromRow($row, $startcol2); + if ($key2 !== null) { + $obj2 = CcFilesPeer::getInstanceFromPool($key2); + if (!$obj2) { + + $cls = CcFilesPeer::getOMClass(); + + $obj2 = new $cls(); + $obj2->hydrate($row, $startcol2); + CcFilesPeer::addInstanceToPool($obj2, $key2); + } // if obj2 loaded + + // Add the $obj1 (ThirdPartyTrackReferences) to the collection in $obj2 (CcFiles) + $obj2->addThirdPartyTrackReferences($obj1); + } // if joined row not null + + $results[] = $obj1; + } + $stmt->closeCursor(); + + return $results; + } + + /** + * Returns the TableMap related to this peer. + * This method is not needed for general use but a specific application could have a need. + * @return TableMap + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function getTableMap() + { + return Propel::getDatabaseMap(ThirdPartyTrackReferencesPeer::DATABASE_NAME)->getTable(ThirdPartyTrackReferencesPeer::TABLE_NAME); + } + + /** + * Add a TableMap instance to the database for this peer class. + */ + public static function buildTableMap() + { + $dbMap = Propel::getDatabaseMap(BaseThirdPartyTrackReferencesPeer::DATABASE_NAME); + if (!$dbMap->hasTable(BaseThirdPartyTrackReferencesPeer::TABLE_NAME)) { + $dbMap->addTableObject(new \ThirdPartyTrackReferencesTableMap()); + } + } + + /** + * The class that the Peer will make instances of. + * + * + * @return string ClassName + */ + public static function getOMClass($row = 0, $colnum = 0) + { + return ThirdPartyTrackReferencesPeer::OM_CLASS; + } + + /** + * Performs an INSERT on the database, given a ThirdPartyTrackReferences or Criteria object. + * + * @param mixed $values Criteria or ThirdPartyTrackReferences object containing data that is used to create the INSERT statement. + * @param PropelPDO $con the PropelPDO connection to use + * @return mixed The new primary key. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doInsert($values, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + if ($values instanceof Criteria) { + $criteria = clone $values; // rename for clarity + } else { + $criteria = $values->buildCriteria(); // build Criteria from ThirdPartyTrackReferences object + } + + if ($criteria->containsKey(ThirdPartyTrackReferencesPeer::ID) && $criteria->keyContainsValue(ThirdPartyTrackReferencesPeer::ID) ) { + throw new PropelException('Cannot insert a value for auto-increment primary key ('.ThirdPartyTrackReferencesPeer::ID.')'); + } + + + // Set the correct dbName + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + try { + // use transaction because $criteria could contain info + // for more than one table (I guess, conceivably) + $con->beginTransaction(); + $pk = BasePeer::doInsert($criteria, $con); + $con->commit(); + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + + return $pk; + } + + /** + * Performs an UPDATE on the database, given a ThirdPartyTrackReferences or Criteria object. + * + * @param mixed $values Criteria or ThirdPartyTrackReferences object containing data that is used to create the UPDATE statement. + * @param PropelPDO $con The connection to use (specify PropelPDO connection object to exert more control over transactions). + * @return int The number of affected rows (if supported by underlying database driver). + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doUpdate($values, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + $selectCriteria = new Criteria(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + if ($values instanceof Criteria) { + $criteria = clone $values; // rename for clarity + + $comparison = $criteria->getComparison(ThirdPartyTrackReferencesPeer::ID); + $value = $criteria->remove(ThirdPartyTrackReferencesPeer::ID); + if ($value) { + $selectCriteria->add(ThirdPartyTrackReferencesPeer::ID, $value, $comparison); + } else { + $selectCriteria->setPrimaryTableName(ThirdPartyTrackReferencesPeer::TABLE_NAME); + } + + } else { // $values is ThirdPartyTrackReferences object + $criteria = $values->buildCriteria(); // gets full criteria + $selectCriteria = $values->buildPkeyCriteria(); // gets criteria w/ primary key(s) + } + + // set the correct dbName + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + return BasePeer::doUpdate($selectCriteria, $criteria, $con); + } + + /** + * Deletes all rows from the third_party_track_references table. + * + * @param PropelPDO $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). + * @throws PropelException + */ + public static function doDeleteAll(PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + $affectedRows = 0; // initialize var to track total num of affected rows + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + $affectedRows += BasePeer::doDeleteAll(ThirdPartyTrackReferencesPeer::TABLE_NAME, $con, ThirdPartyTrackReferencesPeer::DATABASE_NAME); + // Because this db requires some delete cascade/set null emulation, we have to + // clear the cached instance *after* the emulation has happened (since + // instances get re-added by the select statement contained therein). + ThirdPartyTrackReferencesPeer::clearInstancePool(); + ThirdPartyTrackReferencesPeer::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Performs a DELETE on the database, given a ThirdPartyTrackReferences or Criteria object OR a primary key value. + * + * @param mixed $values Criteria or ThirdPartyTrackReferences object or primary key or array of primary keys + * which is used to create the DELETE statement + * @param PropelPDO $con the connection to use + * @return int The number of affected rows (if supported by underlying database driver). This includes CASCADE-related rows + * if supported by native driver or if emulated using Propel. + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function doDelete($values, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_WRITE); + } + + if ($values instanceof Criteria) { + // invalidate the cache for all objects of this type, since we have no + // way of knowing (without running a query) what objects should be invalidated + // from the cache based on this Criteria. + ThirdPartyTrackReferencesPeer::clearInstancePool(); + // rename for clarity + $criteria = clone $values; + } elseif ($values instanceof ThirdPartyTrackReferences) { // it's a model object + // invalidate the cache for this single object + ThirdPartyTrackReferencesPeer::removeInstanceFromPool($values); + // create criteria based on pk values + $criteria = $values->buildPkeyCriteria(); + } else { // it's a primary key, or an array of pks + $criteria = new Criteria(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + $criteria->add(ThirdPartyTrackReferencesPeer::ID, (array) $values, Criteria::IN); + // invalidate the cache for this object(s) + foreach ((array) $values as $singleval) { + ThirdPartyTrackReferencesPeer::removeInstanceFromPool($singleval); + } + } + + // Set the correct dbName + $criteria->setDbName(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + + $affectedRows = 0; // initialize var to track total num of affected rows + + try { + // use transaction because $criteria could contain info + // for more than one table or we could emulating ON DELETE CASCADE, etc. + $con->beginTransaction(); + + $affectedRows += BasePeer::doDelete($criteria, $con); + ThirdPartyTrackReferencesPeer::clearRelatedInstancePool(); + $con->commit(); + + return $affectedRows; + } catch (Exception $e) { + $con->rollBack(); + throw $e; + } + } + + /** + * Validates all modified columns of given ThirdPartyTrackReferences object. + * If parameter $columns is either a single column name or an array of column names + * than only those columns are validated. + * + * NOTICE: This does not apply to primary or foreign keys for now. + * + * @param ThirdPartyTrackReferences $obj The object to validate. + * @param mixed $cols Column name or array of column names. + * + * @return mixed TRUE if all columns are valid or the error message of the first invalid column. + */ + public static function doValidate($obj, $cols = null) + { + $columns = array(); + + if ($cols) { + $dbMap = Propel::getDatabaseMap(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + $tableMap = $dbMap->getTable(ThirdPartyTrackReferencesPeer::TABLE_NAME); + + if (! is_array($cols)) { + $cols = array($cols); + } + + foreach ($cols as $colName) { + if ($tableMap->hasColumn($colName)) { + $get = 'get' . $tableMap->getColumn($colName)->getPhpName(); + $columns[$colName] = $obj->$get(); + } + } + } else { + + } + + return BasePeer::doValidate(ThirdPartyTrackReferencesPeer::DATABASE_NAME, ThirdPartyTrackReferencesPeer::TABLE_NAME, $columns); + } + + /** + * Retrieve a single object by pkey. + * + * @param int $pk the primary key. + * @param PropelPDO $con the connection to use + * @return ThirdPartyTrackReferences + */ + public static function retrieveByPK($pk, PropelPDO $con = null) + { + + if (null !== ($obj = ThirdPartyTrackReferencesPeer::getInstanceFromPool((string) $pk))) { + return $obj; + } + + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $criteria = new Criteria(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + $criteria->add(ThirdPartyTrackReferencesPeer::ID, $pk); + + $v = ThirdPartyTrackReferencesPeer::doSelect($criteria, $con); + + return !empty($v) > 0 ? $v[0] : null; + } + + /** + * Retrieve multiple objects by pkey. + * + * @param array $pks List of primary keys + * @param PropelPDO $con the connection to use + * @return ThirdPartyTrackReferences[] + * @throws PropelException Any exceptions caught during processing will be + * rethrown wrapped into a PropelException. + */ + public static function retrieveByPKs($pks, PropelPDO $con = null) + { + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + + $objs = null; + if (empty($pks)) { + $objs = array(); + } else { + $criteria = new Criteria(ThirdPartyTrackReferencesPeer::DATABASE_NAME); + $criteria->add(ThirdPartyTrackReferencesPeer::ID, $pks, Criteria::IN); + $objs = ThirdPartyTrackReferencesPeer::doSelect($criteria, $con); + } + + return $objs; + } + +} // BaseThirdPartyTrackReferencesPeer + +// This is the static code needed to register the TableMap for this table with the main Propel class. +// +BaseThirdPartyTrackReferencesPeer::buildTableMap(); + diff --git a/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php new file mode 100644 index 000000000..86f0a174d --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php @@ -0,0 +1,628 @@ +mergeWith($criteria); + } + + return $query; + } + + /** + * Find object by primary key. + * Propel uses the instance pool to skip the database if the object exists. + * Go fast if the query is untouched. + * + * + * $obj = $c->findPk(12, $con); + * + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con an optional connection object + * + * @return ThirdPartyTrackReferences|ThirdPartyTrackReferences[]|mixed the result, formatted by the current formatter + */ + public function findPk($key, $con = null) + { + if ($key === null) { + return null; + } + if ((null !== ($obj = ThirdPartyTrackReferencesPeer::getInstanceFromPool((string) $key))) && !$this->formatter) { + // the object is already in the instance pool + return $obj; + } + if ($con === null) { + $con = Propel::getConnection(ThirdPartyTrackReferencesPeer::DATABASE_NAME, Propel::CONNECTION_READ); + } + $this->basePreSelect($con); + if ($this->formatter || $this->modelAlias || $this->with || $this->select + || $this->selectColumns || $this->asColumns || $this->selectModifiers + || $this->map || $this->having || $this->joins) { + return $this->findPkComplex($key, $con); + } else { + return $this->findPkSimple($key, $con); + } + } + + /** + * Alias of findPk to use instance pooling + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con A connection object + * + * @return ThirdPartyTrackReferences A model object, or null if the key is not found + * @throws PropelException + */ + public function findOneByDbId($key, $con = null) + { + return $this->findPk($key, $con); + } + + /** + * Find object by primary key using raw SQL to go fast. + * Bypass doSelect() and the object formatter by using generated code. + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con A connection object + * + * @return ThirdPartyTrackReferences A model object, or null if the key is not found + * @throws PropelException + */ + protected function findPkSimple($key, $con) + { + $sql = 'SELECT "id", "service", "foreign_id", "file_id", "upload_time", "status" FROM "third_party_track_references" WHERE "id" = :p0'; + try { + $stmt = $con->prepare($sql); + $stmt->bindValue(':p0', $key, PDO::PARAM_INT); + $stmt->execute(); + } catch (Exception $e) { + Propel::log($e->getMessage(), Propel::LOG_ERR); + throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), $e); + } + $obj = null; + if ($row = $stmt->fetch(PDO::FETCH_NUM)) { + $obj = new ThirdPartyTrackReferences(); + $obj->hydrate($row); + ThirdPartyTrackReferencesPeer::addInstanceToPool($obj, (string) $key); + } + $stmt->closeCursor(); + + return $obj; + } + + /** + * Find object by primary key. + * + * @param mixed $key Primary key to use for the query + * @param PropelPDO $con A connection object + * + * @return ThirdPartyTrackReferences|ThirdPartyTrackReferences[]|mixed the result, formatted by the current formatter + */ + protected function findPkComplex($key, $con) + { + // As the query uses a PK condition, no limit(1) is necessary. + $criteria = $this->isKeepQuery() ? clone $this : $this; + $stmt = $criteria + ->filterByPrimaryKey($key) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->formatOne($stmt); + } + + /** + * Find objects by primary key + * + * $objs = $c->findPks(array(12, 56, 832), $con); + * + * @param array $keys Primary keys to use for the query + * @param PropelPDO $con an optional connection object + * + * @return PropelObjectCollection|ThirdPartyTrackReferences[]|mixed the list of results, formatted by the current formatter + */ + public function findPks($keys, $con = null) + { + if ($con === null) { + $con = Propel::getConnection($this->getDbName(), Propel::CONNECTION_READ); + } + $this->basePreSelect($con); + $criteria = $this->isKeepQuery() ? clone $this : $this; + $stmt = $criteria + ->filterByPrimaryKeys($keys) + ->doSelect($con); + + return $criteria->getFormatter()->init($criteria)->format($stmt); + } + + /** + * Filter the query by primary key + * + * @param mixed $key Primary key to use for the query + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByPrimaryKey($key) + { + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::ID, $key, Criteria::EQUAL); + } + + /** + * Filter the query by a list of primary keys + * + * @param array $keys The list of primary key to use for the query + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByPrimaryKeys($keys) + { + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::ID, $keys, Criteria::IN); + } + + /** + * Filter the query on the id column + * + * Example usage: + * + * $query->filterByDbId(1234); // WHERE id = 1234 + * $query->filterByDbId(array(12, 34)); // WHERE id IN (12, 34) + * $query->filterByDbId(array('min' => 12)); // WHERE id >= 12 + * $query->filterByDbId(array('max' => 12)); // WHERE id <= 12 + * + * + * @param mixed $dbId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByDbId($dbId = null, $comparison = null) + { + if (is_array($dbId)) { + $useMinMax = false; + if (isset($dbId['min'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::ID, $dbId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($dbId['max'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::ID, $dbId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::ID, $dbId, $comparison); + } + + /** + * Filter the query on the service column + * + * Example usage: + * + * $query->filterByDbService('fooValue'); // WHERE service = 'fooValue' + * $query->filterByDbService('%fooValue%'); // WHERE service LIKE '%fooValue%' + * + * + * @param string $dbService The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByDbService($dbService = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbService)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbService)) { + $dbService = str_replace('*', '%', $dbService); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::SERVICE, $dbService, $comparison); + } + + /** + * Filter the query on the foreign_id column + * + * Example usage: + * + * $query->filterByDbForeignId('fooValue'); // WHERE foreign_id = 'fooValue' + * $query->filterByDbForeignId('%fooValue%'); // WHERE foreign_id LIKE '%fooValue%' + * + * + * @param string $dbForeignId The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByDbForeignId($dbForeignId = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbForeignId)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbForeignId)) { + $dbForeignId = str_replace('*', '%', $dbForeignId); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::FOREIGN_ID, $dbForeignId, $comparison); + } + + /** + * Filter the query on the file_id column + * + * Example usage: + * + * $query->filterByDbFileId(1234); // WHERE file_id = 1234 + * $query->filterByDbFileId(array(12, 34)); // WHERE file_id IN (12, 34) + * $query->filterByDbFileId(array('min' => 12)); // WHERE file_id >= 12 + * $query->filterByDbFileId(array('max' => 12)); // WHERE file_id <= 12 + * + * + * @see filterByCcFiles() + * + * @param mixed $dbFileId The value to use as filter. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByDbFileId($dbFileId = null, $comparison = null) + { + if (is_array($dbFileId)) { + $useMinMax = false; + if (isset($dbFileId['min'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::FILE_ID, $dbFileId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($dbFileId['max'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::FILE_ID, $dbFileId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::FILE_ID, $dbFileId, $comparison); + } + + /** + * Filter the query on the upload_time column + * + * Example usage: + * + * $query->filterByDbUploadTime('2011-03-14'); // WHERE upload_time = '2011-03-14' + * $query->filterByDbUploadTime('now'); // WHERE upload_time = '2011-03-14' + * $query->filterByDbUploadTime(array('max' => 'yesterday')); // WHERE upload_time < '2011-03-13' + * + * + * @param mixed $dbUploadTime The value to use as filter. + * Values can be integers (unix timestamps), DateTime objects, or strings. + * Empty strings are treated as NULL. + * Use scalar values for equality. + * Use array values for in_array() equivalent. + * Use associative array('min' => $minValue, 'max' => $maxValue) for intervals. + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByDbUploadTime($dbUploadTime = null, $comparison = null) + { + if (is_array($dbUploadTime)) { + $useMinMax = false; + if (isset($dbUploadTime['min'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::UPLOAD_TIME, $dbUploadTime['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($dbUploadTime['max'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::UPLOAD_TIME, $dbUploadTime['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::UPLOAD_TIME, $dbUploadTime, $comparison); + } + + /** + * Filter the query on the status column + * + * Example usage: + * + * $query->filterByDbStatus('fooValue'); // WHERE status = 'fooValue' + * $query->filterByDbStatus('%fooValue%'); // WHERE status LIKE '%fooValue%' + * + * + * @param string $dbStatus The value to use as filter. + * Accepts wildcards (* and % trigger a LIKE) + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function filterByDbStatus($dbStatus = null, $comparison = null) + { + if (null === $comparison) { + if (is_array($dbStatus)) { + $comparison = Criteria::IN; + } elseif (preg_match('/[\%\*]/', $dbStatus)) { + $dbStatus = str_replace('*', '%', $dbStatus); + $comparison = Criteria::LIKE; + } + } + + return $this->addUsingAlias(ThirdPartyTrackReferencesPeer::STATUS, $dbStatus, $comparison); + } + + /** + * Filter the query by a related CcFiles object + * + * @param CcFiles|PropelObjectCollection $ccFiles The related object(s) to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + * @throws PropelException - if the provided filter is invalid. + */ + public function filterByCcFiles($ccFiles, $comparison = null) + { + if ($ccFiles instanceof CcFiles) { + return $this + ->addUsingAlias(ThirdPartyTrackReferencesPeer::FILE_ID, $ccFiles->getDbId(), $comparison); + } elseif ($ccFiles instanceof PropelObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(ThirdPartyTrackReferencesPeer::FILE_ID, $ccFiles->toKeyValue('PrimaryKey', 'DbId'), $comparison); + } else { + throw new PropelException('filterByCcFiles() only accepts arguments of type CcFiles or PropelCollection'); + } + } + + /** + * Adds a JOIN clause to the query using the CcFiles relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function joinCcFiles($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CcFiles'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'CcFiles'); + } + + return $this; + } + + /** + * Use the CcFiles relation CcFiles object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return CcFilesQuery A secondary query class using the current class as primary query + */ + public function useCcFilesQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCcFiles($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcFiles', 'CcFilesQuery'); + } + + /** + * Filter the query by a related CeleryTasks object + * + * @param CeleryTasks|PropelObjectCollection $celeryTasks the related object to use as filter + * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + * @throws PropelException - if the provided filter is invalid. + */ + public function filterByCeleryTasks($celeryTasks, $comparison = null) + { + if ($celeryTasks instanceof CeleryTasks) { + return $this + ->addUsingAlias(ThirdPartyTrackReferencesPeer::ID, $celeryTasks->getDbTrackReference(), $comparison); + } elseif ($celeryTasks instanceof PropelObjectCollection) { + return $this + ->useCeleryTasksQuery() + ->filterByPrimaryKeys($celeryTasks->getPrimaryKeys()) + ->endUse(); + } else { + throw new PropelException('filterByCeleryTasks() only accepts arguments of type CeleryTasks or PropelCollection'); + } + } + + /** + * Adds a JOIN clause to the query using the CeleryTasks relation + * + * @param string $relationAlias optional alias for the relation + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function joinCeleryTasks($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CeleryTasks'); + + // create a ModelJoin object for this join + $join = new ModelJoin(); + $join->setJoinType($joinType); + $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias); + if ($previousJoin = $this->getPreviousJoin()) { + $join->setPreviousJoin($previousJoin); + } + + // add the ModelJoin to the current object + if ($relationAlias) { + $this->addAlias($relationAlias, $relationMap->getRightTable()->getName()); + $this->addJoinObject($join, $relationAlias); + } else { + $this->addJoinObject($join, 'CeleryTasks'); + } + + return $this; + } + + /** + * Use the CeleryTasks relation CeleryTasks object + * + * @see useQuery() + * + * @param string $relationAlias optional alias for the relation, + * to be used as main alias in the secondary query + * @param string $joinType Accepted values are null, 'left join', 'right join', 'inner join' + * + * @return CeleryTasksQuery A secondary query class using the current class as primary query + */ + public function useCeleryTasksQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCeleryTasks($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CeleryTasks', 'CeleryTasksQuery'); + } + + /** + * Exclude object from result + * + * @param ThirdPartyTrackReferences $thirdPartyTrackReferences Object to remove from the list of results + * + * @return ThirdPartyTrackReferencesQuery The current query, for fluid interface + */ + public function prune($thirdPartyTrackReferences = null) + { + if ($thirdPartyTrackReferences) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::ID, $thirdPartyTrackReferences->getDbId(), Criteria::NOT_EQUAL); + } + + return $this; + } + +} diff --git a/airtime_mvc/application/services/CalendarService.php b/airtime_mvc/application/services/CalendarService.php index abef0d292..e8de4c73f 100644 --- a/airtime_mvc/application/services/CalendarService.php +++ b/airtime_mvc/application/services/CalendarService.php @@ -55,23 +55,6 @@ class Application_Service_CalendarService "icon" => "overview", "url" => $baseUrl."library/edit-file-md/id/".$ccFile->getDbId()); } - - //recorded show can be uploaded to soundcloud - if (Application_Model_Preference::GetUploadToSoundcloudOption()) { - $scid = $ccFile->getDbSoundcloudId(); - - if ($scid > 0) { - $menu["soundcloud_view"] = array( - "name" => _("View on Soundcloud"), - "icon" => "soundcloud", - "url" => $ccFile->getDbSoundcloudLinkToFile()); - } - - $text = is_null($scid) ? _('Upload to SoundCloud') : _('Re-upload to SoundCloud'); - $menu["soundcloud_upload"] = array( - "name"=> $text, - "icon" => "soundcloud"); - } } else { $menu["content"] = array( "name"=> _("Show Content"), diff --git a/airtime_mvc/application/services/CeleryService.php b/airtime_mvc/application/services/CeleryService.php new file mode 100644 index 000000000..8e9091290 --- /dev/null +++ b/airtime_mvc/application/services/CeleryService.php @@ -0,0 +1,211 @@ +PostTask($task, $data, true, $routingKey); // and routing key + return $result->getId(); + } + + /** + * Given a task name and identifier, check the Celery results queue for any + * corresponding messages + * + * @param $task CeleryTasks the Celery task object + * + * @return array the message response array + * + * @throws CeleryException when no message is found + * @throws CeleryTimeoutException when no message is found and more than + * $_CELERY_MESSAGE_TIMEOUT milliseconds have passed + */ + private static function getAsyncResultMessage($task) { + $config = parse_ini_file(Application_Model_RabbitMq::getRmqConfigPath(), true); + $queue = self::$_CELERY_RESULTS_EXCHANGE . "." . $task; + $c = self::_setupCeleryExchange($config, self::$_CELERY_RESULTS_EXCHANGE, $queue); + $message = $c->getAsyncResultMessage($task->getDbName(), $task->getDbTaskId()); + + // If the message isn't ready yet (Celery hasn't finished the task), + // only throw an exception if the message has timed out. + if ($message == FALSE) { + if (self::_checkMessageTimeout($task)) { + // If the task times out, mark it as failed. We don't want to remove the + // track reference here in case it was a deletion that failed, for example. + $task->setDbStatus(CELERY_FAILED_STATUS)->save(); + throw new CeleryTimeoutException("Celery task " . $task->getDbName() + . " with ID " . $task->getDbTaskId() . " timed out"); + } else { + // The message hasn't timed out, but it's still false, which means it hasn't been + // sent back from Celery yet. + throw new CeleryException("Waiting on Celery task " . $task->getDbName() + . " with ID " . $task->getDbTaskId()); + } + } + return $message; + } + + /** + * Check to see if there are any pending tasks for this service + * + * @param string $taskName the name of the task to poll for + * @param string $serviceName the name of the service to poll for + * + * @return bool true if there are any pending tasks, otherwise false + */ + public static function isBrokerTaskQueueEmpty($taskName="", $serviceName = "") { + $pendingTasks = self::_getPendingTasks($taskName, $serviceName); + return empty($pendingTasks); + } + + /** + * Poll the message queue for this service to see if any tasks with the given name have completed + * + * If we find any completed tasks, adjust the ThirdPartyTrackReferences table accordingly + * + * If no task name is passed, we poll all tasks for this service + * + * @param string $taskName the name of the task to poll for + * @param string $serviceName the name of the service to poll for + */ + public static function pollBrokerTaskQueue($taskName = "", $serviceName = "") { + $pendingTasks = self::_getPendingTasks($taskName, $serviceName); + foreach ($pendingTasks as $task) { + try { + $message = self::_getTaskMessage($task); + self::_processTaskMessage($task, $message); + } catch (CeleryTimeoutException $e) { + Logging::warn($e->getMessage()); + } catch (Exception $e) { + // Because $message->result can be either an object or a string, sometimes + // we get a json_decode error and end up here + Logging::info($e->getMessage()); + } + } + } + + /** + * Return a collection of all pending CeleryTasks for this service or task + * + * @param string $taskName the name of the task to find + * @param string $serviceName the name of the service to find + * + * @return PropelCollection any pending CeleryTasks results for this service + * or task if taskName is provided + */ + protected static function _getPendingTasks($taskName, $serviceName) { + $query = CeleryTasksQuery::create() + ->filterByDbStatus(CELERY_PENDING_STATUS) + ->filterByDbTaskId('', Criteria::NOT_EQUAL); + if (!empty($taskName)) { + $query->filterByDbName($taskName); + } + if (!empty($serviceName)) { + $query->useThirdPartyTrackReferencesQuery() + ->filterByDbService($serviceName)->endUse(); + } + return $query->joinThirdPartyTrackReferences() + ->with('ThirdPartyTrackReferences')->find(); + } + + /** + * Get a Celery task message from the results queue + * + * @param $task CeleryTasks the Celery task object + * + * @return object the task message object + * + * @throws CeleryException when the result message for this task is still pending + * @throws CeleryTimeoutException when the result message for this task no longer exists + */ + protected static function _getTaskMessage($task) { + $message = self::getAsyncResultMessage($task); + return json_decode($message['body']); + } + + /** + * Process a message from the results queue + * + * @param $task CeleryTasks Celery task object + * @param $message mixed async message object from php-celery + */ + protected static function _processTaskMessage($task, $message) { + $ref = $task->getThirdPartyTrackReferences(); // ThirdPartyTrackReferences join + $service = CeleryServiceFactory::getService($ref->getDbService()); + if ($message->status == CELERY_SUCCESS_STATUS + && $task->getDbName() == $service->getCeleryDeleteTaskName()) { + $service->removeTrackReference($ref->getDbFileId()); + } else { + $service->updateTrackReference($ref->getDbId(), json_decode($message->result), $message->status); + } + } + + /** + * Check if a task message has been unreachable for more our timeout time + * + * @param $task CeleryTasks the Celery task object + * + * @return bool true if the dispatch time is empty or it's been more than our timeout time + * since the message was dispatched, otherwise false + */ + protected static function _checkMessageTimeout($task) { + $utc = new DateTimeZone("UTC"); + $dispatchTime = new DateTime($task->getDbDispatchTime(), $utc); + $now = new DateTime("now", $utc); + $timeoutSeconds = self::$_CELERY_MESSAGE_TIMEOUT / 1000; // Convert from milliseconds + $timeoutInterval = new DateInterval("PT" . $timeoutSeconds . "S"); + return (empty($dispatchTime) || $dispatchTime->add($timeoutInterval) <= $now); + } + +} \ No newline at end of file diff --git a/airtime_mvc/application/services/CeleryServiceFactory.php b/airtime_mvc/application/services/CeleryServiceFactory.php new file mode 100644 index 000000000..defb6ce81 --- /dev/null +++ b/airtime_mvc/application/services/CeleryServiceFactory.php @@ -0,0 +1,20 @@ + "license", + "getDefaultSoundCloudSharingType" => "sharing" + ); + + /** + * Initialize the service + */ + public function __construct() { + $CC_CONFIG = Config::getConfig(); + $clientId = $CC_CONFIG['soundcloud-client-id']; + $clientSecret = $CC_CONFIG['soundcloud-client-secret']; + $redirectUri = $CC_CONFIG['soundcloud-redirect-uri']; + + $this->_client = new Soundcloud\Service($clientId, $clientSecret, $redirectUri); + $accessToken = Application_Model_Preference::getSoundCloudRequestToken(); + if (!empty($accessToken)) { + $this->_accessToken = $accessToken; + $this->_client->setAccessToken($accessToken); + } + } + + /** + * Build a parameter array for the track being uploaded to SoundCloud + * + * @param $file Application_Model_StoredFile the file being uploaded + * + * @return array the track array to send to SoundCloud + */ + protected function _getUploadData($file) { + $file = $file->getPropelOrm(); + $trackArray = $this->_serializeTrack($file); + foreach (self::$_SOUNDCLOUD_PREF_FUNCTIONS as $func => $param) { + $val = Application_Model_Preference::$func(); + if (!empty($val)) { + $trackArray[$param] = $val; + } + } + + return $trackArray; + } + + /** + * Serialize Airtime file data to send to SoundCloud + * + * Ignores any null fields, as these will cause the upload to throw a 422 + * Unprocessable Entity error + * + * TODO: Move this into a proper serializer + * + * @param $file CcFiles file object + * + * @return array the serialized data + */ + protected function _serializeTrack($file) { + $fileData = array( + 'title' => $file->getDbTrackTitle(), + 'genre' => $file->getDbGenre(), + 'bpm' => $file->getDbBpm(), + 'release_year' => $file->getDbYear(), + ); + $trackArray = array(); + foreach ($fileData as $k => $v) { + if (!empty($v)) { + $trackArray[$k] = $v; + } + } + return $trackArray; + } + + /** + * Update a ThirdPartyTrackReferences object for a completed upload + * + * TODO: should we have a database layer class to handle Propel operations? + * + * @param $trackId int ThirdPartyTrackReferences identifier + * @param $track object third-party service track object + * @param $status string Celery task status + * + * @throws Exception + * @throws PropelException + */ + public function updateTrackReference($trackId, $track, $status) { + parent::updateTrackReference($trackId, $track, $status); + $ref = ThirdPartyTrackReferencesQuery::create() + ->findOneByDbId($trackId); + if (is_null($ref)) { + $ref = new ThirdPartyTrackReferences(); + } + $ref->setDbService(static::$_SERVICE_NAME); + // Only set the SoundCloud fields if the task was successful + if ($status == CELERY_SUCCESS_STATUS) { + $utc = new DateTimeZone("UTC"); + $ref->setDbUploadTime(new DateTime("now", $utc)); + // TODO: fetch any additional SoundCloud parameters we want to store + $ref->setDbForeignId($track->id); // SoundCloud identifier + } + // TODO: set SoundCloud upload status? + // $ref->setDbStatus($status); + $ref->save(); + } + + /** + * Given a CcFiles identifier for a file that's been uploaded to SoundCloud, + * return a link to the remote file + * + * @param int $fileId the local CcFiles identifier + * + * @return string the link to the remote file + * + * @throws Soundcloud\Exception\InvalidHttpResponseCodeException when SoundCloud returns a 4xx/5xx response + */ + public function getLinkToFile($fileId) { + $serviceId = $this->getServiceId($fileId); + // If we don't find a record for the file we'll get 0 back for the id + if ($serviceId == 0) { return ''; } + try { + $track = json_decode($this->_client->get('tracks/' . $serviceId)); + } catch (Soundcloud\Exception\InvalidHttpResponseCodeException $e) { + // If we end up here it means the track was removed from SoundCloud + // or the foreign id in our database is incorrect, so we should just + // get rid of the database record + Logging::warn("Error retrieving track data from SoundCloud: " . $e->getMessage()); + $this->removeTrackReference($fileId); + throw $e; // Throw the exception up to the controller so we can redirect to a 404 + } + return $track->permalink_url; + } + + /** + * Check whether an access token exists for the SoundCloud client + * + * @return bool true if an access token exists, otherwise false + */ + public function hasAccessToken() { + return !empty($this->_accessToken); + } + + /** + * Get the SoundCloud authorization URL + * + * @return string the authorization URL + */ + public function getAuthorizeUrl() { + // Pass the current URL in the state parameter in order to preserve it + // in the redirect. This allows us to create a singular script to redirect + // back to any station the request comes from. + $url = urlencode('http'.(empty($_SERVER['HTTPS'])?'':'s').'://'.$_SERVER['HTTP_HOST'].'/soundcloud/redirect'); + return $this->_client->getAuthorizeUrl(array("state" => $url, "scope" => "non-expiring")); + } + + /** + * Request a new access token from SoundCloud and store it in CcPref + * + * @param $code string exchange authorization code for access token + */ + public function requestNewAccessToken($code) { + // Get a non-expiring access token + $response = $this->_client->accessToken($code); + $accessToken = $response['access_token']; + Application_Model_Preference::setSoundCloudRequestToken($accessToken); + $this->_accessToken = $accessToken; + } + + /** + * Regenerate the SoundCloud client's access token + * + * @throws Soundcloud\Exception\InvalidHttpResponseCodeException + * thrown when attempting to regenerate a stale token + */ + public function accessTokenRefresh() { + assert($this->hasAccessToken()); + try { + $accessToken = $this->_accessToken; + $this->_client->accessTokenRefresh($accessToken); + } catch(Soundcloud\Exception\InvalidHttpResponseCodeException $e) { + // If we get here, then that means our token is stale, so remove it + // Because we're using non-expiring tokens, we shouldn't get here (!) + Application_Model_Preference::setSoundCloudRequestToken(""); + } + } + +} \ No newline at end of file diff --git a/airtime_mvc/application/services/ThirdPartyCeleryService.php b/airtime_mvc/application/services/ThirdPartyCeleryService.php new file mode 100644 index 000000000..5dbc1ebad --- /dev/null +++ b/airtime_mvc/application/services/ThirdPartyCeleryService.php @@ -0,0 +1,131 @@ + $this->_getUploadData($file), + 'token' => $this->_accessToken, + 'file_path' => $file->getFilePaths()[0] + ); + try { + $brokerTaskId = CeleryService::sendCeleryMessage(static::$_CELERY_UPLOAD_TASK_NAME, + static::$_CELERY_EXCHANGE_NAME, + $data); + $this->_createTaskReference($fileId, $brokerTaskId, static::$_CELERY_UPLOAD_TASK_NAME); + } catch (Exception $e) { + Logging::info("Invalid request: " . $e->getMessage()); + } + } + + /** + * Delete the file with the given identifier from a third-party service + * + * @param int $fileId the local CcFiles identifier + * + * @throws ServiceNotFoundException when a $fileId with no corresponding + * service identifier is given + */ + public function delete($fileId) { + $serviceId = $this->getServiceId($fileId); + if ($serviceId == 0) { + throw new ServiceNotFoundException("No service found for file with ID $fileId"); + } + $data = array( + 'token' => $this->_accessToken, + 'track_id' => $serviceId + ); + try { + $brokerTaskId = CeleryService::sendCeleryMessage(static::$_CELERY_DELETE_TASK_NAME, + static::$_CELERY_EXCHANGE_NAME, + $data); + $this->_createTaskReference($fileId, $brokerTaskId, static::$_CELERY_DELETE_TASK_NAME); + } catch (Exception $e) { + Logging::info("Invalid request: " . $e->getMessage()); + } + } + + /** + * Create a CeleryTasks object for a pending task + * TODO: should we have a database layer class to handle Propel operations? + * + * @param $fileId int CcFiles identifier + * @param $brokerTaskId int broker task identifier to so we can asynchronously + * receive completed task messages + * @param $taskName string broker task name + * + * @throws Exception + * @throws PropelException + */ + protected function _createTaskReference($fileId, $brokerTaskId, $taskName) { + $trackId = $this->createTrackReference($fileId); + $task = new CeleryTasks(); + $task->setDbTaskId($brokerTaskId); + $task->setDbName($taskName); + $utc = new DateTimeZone("UTC"); + $task->setDbDispatchTime(new DateTime("now", $utc)); + $task->setDbStatus(CELERY_PENDING_STATUS); + $task->setDbTrackReference($trackId); + $task->save(); + } + + /** + * Update a CeleryTasks object for a completed upload + * TODO: should we have a database layer class to handle Propel operations? + * + * @param $trackId int ThirdPartyTrackReferences identifier + * @param $track object third-party service track object + * @param $status string Celery task status + * + * @throws Exception + * @throws PropelException + */ + public function updateTrackReference($trackId, $track, $status) { + $task = CeleryTasksQuery::create() + ->findOneByDbTrackReference($trackId); + $task->setDbStatus($status); + $task->save(); + } + + /** + * Field accessor for $_CELERY_DELETE_TASK_NAME + * + * @return string the Celery task name for deleting tracks from this service + */ + public function getCeleryDeleteTaskName() { + return static::$_CELERY_DELETE_TASK_NAME; + } + + /** + * Build a parameter array for the file being uploaded to a third party service + * + * @param $file Application_Model_StoredFile the file being uploaded + * + * @return array the track array to send to the third party service + */ + abstract protected function _getUploadData($file); + +} \ No newline at end of file diff --git a/airtime_mvc/application/services/ThirdPartyService.php b/airtime_mvc/application/services/ThirdPartyService.php new file mode 100644 index 000000000..5af1eb0e4 --- /dev/null +++ b/airtime_mvc/application/services/ThirdPartyService.php @@ -0,0 +1,149 @@ +filterByDbService(static::$_SERVICE_NAME) + ->findOneByDbFileId($fileId); + if (is_null($ref)) { + $ref = new ThirdPartyTrackReferences(); + } + $ref->setDbService(static::$_SERVICE_NAME); + // TODO: implement service-specific statuses? + // $ref->setDbStatus(CELERY_PENDING_STATUS); + $ref->setDbFileId($fileId); + $ref->save(); + return $ref->getDbId(); + } + + /** + * Remove a ThirdPartyTrackReferences from the database. + * This is necessary if the track was removed from the service + * or the foreign id in our database is incorrect + * + * @param $fileId int cc_files identifier + * + * @throws Exception + * @throws PropelException + */ + public function removeTrackReference($fileId) { + $ref = ThirdPartyTrackReferencesQuery::create() + ->filterByDbService(static::$_SERVICE_NAME) + ->findOneByDbFileId($fileId); + $ref->delete(); + } + + /** + * Given a CcFiles identifier for a file that's been uploaded to a third-party service, + * return the third-party identifier for the remote file + * + * @param int $fileId the cc_files identifier + * + * @return string the service foreign identifier + */ + public function getServiceId($fileId) { + $ref = ThirdPartyTrackReferencesQuery::create() + ->filterByDbService(static::$_SERVICE_NAME) + ->findOneByDbFileId($fileId); // There shouldn't be duplicates! + return empty($ref) ? '' : $ref->getDbForeignId(); + } + + /** + * Check if a reference exists for a given CcFiles identifier + * + * @param int $fileId the cc_files identifier + * + * @return string the service foreign identifier + */ + public function referenceExists($fileId) { + $ref = ThirdPartyTrackReferencesQuery::create() + ->filterByDbService(static::$_SERVICE_NAME) + ->findOneByDbFileId($fileId); // There shouldn't be duplicates! + if (!empty($ref)) { + $task = CeleryTasksQuery::create() + ->findOneByDbTrackReference($ref->getDbId()); + return $task->getDbStatus() != CELERY_FAILED_STATUS; + } + return false; + } + + /** + * Given a CcFiles identifier for a file that's been uploaded to a third-party service, + * return a link to the remote file + * + * @param int $fileId the cc_files identifier + * + * @return string the link to the remote file + */ + public function getLinkToFile($fileId) { + $serviceId = $this->getServiceId($fileId); + return empty($serviceId) ? '' : static::$_THIRD_PARTY_TRACK_URI . $serviceId; + } + + /** + * Upload the file with the given identifier to a third-party service + * + * @param int $fileId the cc_files identifier + */ + abstract function upload($fileId); + + /** + * Delete the file with the given identifier from a third-party service + * + * @param int $fileId the cc_files identifier + * + * @throws ServiceNotFoundException when a $fileId with no corresponding + * service identifier is given + */ + abstract function delete($fileId); + + /** + * Update a ThirdPartyTrackReferences object for a completed task + * + * @param $trackId int ThirdPartyTrackReferences identifier + * @param $track object third-party service track object + * @param $status string Celery task status + * + * @throws Exception + * @throws PropelException + */ + abstract function updateTrackReference($trackId, $track, $status); + +} \ No newline at end of file diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index 812a36fb9..aa012eca6 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -1,69 +1,137 @@ runUpgrades($upgraders, (dirname(__DIR__) . "/controllers")); + */ } /** - * Run a given set of upgrades - * - * @param array $upgraders the upgrades to perform - * @param string $dir the directory containing the upgrade sql + * Upgrade the Airtime schema version to match the highest supported version + * * @return boolean whether or not an upgrade was performed */ - public function runUpgrades($upgraders, $dir) { + public static function doUpgrade() + { + // Get all upgrades dynamically (in declaration order!) so we don't have to add them explicitly each time + // TODO: explicitly sort classnames by ascending version suffix for safety + $upgraders = getUpgrades(); + $dir = (dirname(__DIR__) . "/controllers"); $upgradePerformed = false; - - for($i = 0; $i < count($upgraders); $i++) { - $upgrader = $upgraders[$i]; - if ($upgrader->checkIfUpgradeSupported()) { - // pass the given directory to the upgrades, since __DIR__ returns parent dir of file, not executor - $upgrader->upgrade($dir); // This will throw an exception if the upgrade fails. - $upgradePerformed = true; - $i = 0; // Start over, in case the upgrade handlers are not in ascending order. - } + + foreach ($upgraders as $upgrader) { + $upgradePerformed = self::_runUpgrade(new $upgrader($dir)) ? true : $upgradePerformed; } - + return $upgradePerformed; } + /** + * Downgrade the Airtime schema version to match the given version + * + * @param string $toVersion the version we want to downgrade to + * + * @return boolean whether or not an upgrade was performed + */ + public static function doDowngrade($toVersion) + { + $downgraders = array_reverse(getUpgrades()); // Reverse the array because we're downgrading + $dir = (dirname(__DIR__) . "/controllers"); + $downgradePerformed = false; + + foreach ($downgraders as $downgrader) { + /** @var AirtimeUpgrader $downgrader */ + $downgrader = new $downgrader($dir); + if ($downgrader->getNewVersion() == $toVersion) { + break; // We've reached the version we wanted to downgrade to, so break + } + $downgradePerformed = self::_runDowngrade($downgrader) ? true : $downgradePerformed; + } + + return $downgradePerformed; + } + + /** + * Run the given upgrade + * + * @param $upgrader AirtimeUpgrader the upgrader class to be executed + * + * @return bool true if the upgrade was successful, otherwise false + */ + private static function _runUpgrade(AirtimeUpgrader $upgrader) { + return $upgrader->checkIfUpgradeSupported() && $upgrader->upgrade(); + } + + /** + * Run the given downgrade + * + * @param $downgrader AirtimeUpgrader the upgrader class to be executed + * @param $supportedVersions array array of supported versions + * + * @return bool true if the downgrade was successful, otherwise false + */ + private static function _runDowngrade(AirtimeUpgrader $downgrader) { + return $downgrader->checkIfDowngradeSupported() && $downgrader->downgrade(); + } + } abstract class AirtimeUpgrader { + protected $_dir; + + protected $username, $password, $host, $database; + + /** + * @param $dir string directory housing upgrade files + */ + public function __construct($dir) { + $this->_dir = $dir; + } + /** Schema versions that this upgrader class can upgrade from (an array of version strings). */ abstract protected function getSupportedSchemaVersions(); + /** The schema version that this upgrader class will upgrade to. (returns a version string) */ abstract public function getNewVersion(); @@ -71,19 +139,26 @@ abstract class AirtimeUpgrader { return Application_Model_Preference::GetSchemaVersion(); } - - /** + + /** * This function checks to see if this class can perform an upgrade of your version of Airtime * @return boolean True if we can upgrade your version of Airtime. */ public function checkIfUpgradeSupported() - { - if (!in_array(AirtimeUpgrader::getCurrentSchemaVersion(), $this->getSupportedSchemaVersions())) { - return false; - } - return true; + { + return in_array(static::getCurrentSchemaVersion(), $this->getSupportedSchemaVersions()); } - + + /** + * This function checks to see if this class can perform a downgrade of your version of Airtime + * + * @return boolean True if we can downgrade your version of Airtime. + */ + public function checkIfDowngradeSupported() + { + return static::getCurrentSchemaVersion() == $this->getNewVersion(); + } + protected function toggleMaintenanceScreen($toggle) { if ($toggle) @@ -105,9 +180,86 @@ abstract class AirtimeUpgrader }*/ } } - - /** Implement this for each new version of Airtime */ - abstract public function upgrade(); + + /** + * Implement this for each new version of Airtime + * This function abstracts out the core upgrade functionality, + * allowing child classes to overwrite _runUpgrade to reduce duplication + */ + public function upgrade() { + Cache::clear(); + assert($this->checkIfUpgradeSupported()); + + try { + // $this->toggleMaintenanceScreen(true); + Cache::clear(); + + $this->_getDbValues(); + $this->_runUpgrade(); + + Application_Model_Preference::SetSchemaVersion($this->getNewVersion()); + Cache::clear(); + + // $this->toggleMaintenanceScreen(false); + } catch(Exception $e) { + // $this->toggleMaintenanceScreen(false); + return false; + } + + return true; + } + + /** + * Implement this for each new version of Airtime + * This function abstracts out the core downgrade functionality, + * allowing child classes to overwrite _runDowngrade to reduce duplication + */ + public function downgrade() { + Cache::clear(); + + try { + $this->_getDbValues(); + $this->_runDowngrade(); + + $highestSupportedVersion = null; + foreach ($this->getSupportedSchemaVersions() as $v) { + // version_compare returns 1 (true) if the second parameter is lower + if (!$highestSupportedVersion || version_compare($v, $highestSupportedVersion)) { + $highestSupportedVersion = $v; + } + } + + // Set the schema version to the highest supported version so we don't skip versions when downgrading + Application_Model_Preference::SetSchemaVersion($highestSupportedVersion); + + Cache::clear(); + } catch(Exception $e) { + return false; + } + + return true; + } + + protected function _getDbValues() { + $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; + $values = parse_ini_file($airtimeConf, true); + + $this->username = $values['database']['dbuser']; + $this->password = $values['database']['dbpass']; + $this->host = $values['database']['host']; + $this->database = $values['database']['dbname']; + } + + protected function _runUpgrade() { + passthru("export PGPASSWORD=".$this->password." && psql -h ".$this->host." -U ".$this->username." -q -f ".$this->_dir."/upgrade_sql/airtime_" + .$this->getNewVersion()."/upgrade.sql ".$this->database." 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); + } + + protected function _runDowngrade() { + passthru("export PGPASSWORD=".$this->password." && psql -h ".$this->host." -U ".$this->username." -q -f ".$this->_dir."/downgrade_sql/airtime_" + .$this->getNewVersion()."/downgrade.sql ".$this->database." 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); + } + } class AirtimeUpgrader253 extends AirtimeUpgrader @@ -121,60 +273,17 @@ class AirtimeUpgrader253 extends AirtimeUpgrader { return '2.5.3'; } - - public function upgrade($dir = __DIR__) - { - Cache::clear(); - assert($this->checkIfUpgradeSupported()); - - $con = Propel::getConnection(); - $con->beginTransaction(); - try { - - $this->toggleMaintenanceScreen(true); - Cache::clear(); - - //Begin upgrade - - //Update disk_usage value in cc_pref - $musicDir = CcMusicDirsQuery::create() - ->filterByType('stor') - ->filterByExists(true) - ->findOne(); - $storPath = $musicDir->getDirectory(); - - //Update disk_usage value in cc_pref - $storDir = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."srv/airtime/stor" : "/srv/airtime/stor"; - $diskUsage = shell_exec("du -sb $storDir | awk '{print $1}'"); - - Application_Model_Preference::setDiskUsage($diskUsage); - - //clear out the cache - Cache::clear(); - - $con->commit(); - - //update system_version in cc_pref and change some columns in cc_files - $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; - $values = parse_ini_file($airtimeConf, true); - - $username = $values['database']['dbuser']; - $password = $values['database']['dbpass']; - $host = $values['database']['host']; - $database = $values['database']['dbname']; - - passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_".$this->getNewVersion()."/upgrade.sql $database 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); - Application_Model_Preference::SetSchemaVersion($this->getNewVersion()); - //clear out the cache - Cache::clear(); - - $this->toggleMaintenanceScreen(false); - - } catch (Exception $e) { - $con->rollback(); - $this->toggleMaintenanceScreen(false); - } + protected function _runUpgrade() + { + //Update disk_usage value in cc_pref + $storDir = isset($_SERVER['AIRTIME_BASE']) ? $_SERVER['AIRTIME_BASE']."srv/airtime/stor" : "/srv/airtime/stor"; + $diskUsage = shell_exec("du -sb $storDir | awk '{print $1}'"); + + Application_Model_Preference::setDiskUsage($diskUsage); + + //update system_version in cc_pref and change some columns in cc_files + parent::_runUpgrade(); } } @@ -189,78 +298,49 @@ class AirtimeUpgrader254 extends AirtimeUpgrader return '2.5.4'; } - public function upgrade() + protected function _runUpgrade() { - Cache::clear(); - - assert($this->checkIfUpgradeSupported()); - - $newVersion = $this->getNewVersion(); - - $con = Propel::getConnection(); - //$con->beginTransaction(); - try { - $this->toggleMaintenanceScreen(true); - Cache::clear(); - - //Begin upgrade - - //First, ensure there are no superadmins already. - $numberOfSuperAdmins = CcSubjsQuery::create() + //First, ensure there are no superadmins already. + $numberOfSuperAdmins = CcSubjsQuery::create() ->filterByDbType(UTYPE_SUPERADMIN) ->filterByDbLogin("sourcefabric_admin", Criteria::NOT_EQUAL) //Ignore sourcefabric_admin users ->count(); - - //Only create a super admin if there isn't one already. - if ($numberOfSuperAdmins == 0) - { - //Find the "admin" user and promote them to superadmin. - $adminUser = CcSubjsQuery::create() + + //Only create a super admin if there isn't one already. + if ($numberOfSuperAdmins == 0) + { + //Find the "admin" user and promote them to superadmin. + $adminUser = CcSubjsQuery::create() ->filterByDbLogin('admin') ->findOne(); - if (!$adminUser) - { - //TODO: Otherwise get the user with the lowest ID that is of type administrator: - // - $adminUser = CcSubjsQuery::create() + if (!$adminUser) + { + // Otherwise get the user with the lowest ID that is of type administrator: + $adminUser = CcSubjsQuery::create() ->filterByDbType(UTYPE_ADMIN) ->orderByDbId(Criteria::ASC) ->findOne(); - - if (!$adminUser) { - throw new Exception("Failed to find any users of type 'admin' ('A')."); - } - } - - $adminUser = new Application_Model_User($adminUser->getDbId()); - $adminUser->setType(UTYPE_SUPERADMIN); - $adminUser->save(); - Logging::info($_SERVER['HTTP_HOST'] . ': ' . $newVersion . " Upgrade: Promoted user " . $adminUser->getLogin() . " to be a Super Admin."); - - //Also try to promote the sourcefabric_admin user - $sofabAdminUser = CcSubjsQuery::create() - ->filterByDbLogin('sourcefabric_admin') - ->findOne(); - if ($sofabAdminUser) { - $sofabAdminUser = new Application_Model_User($sofabAdminUser->getDbId()); - $sofabAdminUser->setType(UTYPE_SUPERADMIN); - $sofabAdminUser->save(); - Logging::info($_SERVER['HTTP_HOST'] . ': ' . $newVersion . " Upgrade: Promoted user " . $sofabAdminUser->getLogin() . " to be a Super Admin."); + + if (!$adminUser) { + throw new Exception("Failed to find any users of type 'admin' ('A')."); } } - - //$con->commit(); - Application_Model_Preference::SetSchemaVersion($newVersion); - Cache::clear(); - - $this->toggleMaintenanceScreen(false); - - return true; - - } catch(Exception $e) { - //$con->rollback(); - $this->toggleMaintenanceScreen(false); - throw $e; + + $adminUser = new Application_Model_User($adminUser->getDbId()); + $adminUser->setType(UTYPE_SUPERADMIN); + $adminUser->save(); + Logging::info($_SERVER['HTTP_HOST'] . ': ' . $this->getNewVersion() . " Upgrade: Promoted user " . $adminUser->getLogin() . " to be a Super Admin."); + + //Also try to promote the sourcefabric_admin user + $sofabAdminUser = CcSubjsQuery::create() + ->filterByDbLogin('sourcefabric_admin') + ->findOne(); + if ($sofabAdminUser) { + $sofabAdminUser = new Application_Model_User($sofabAdminUser->getDbId()); + $sofabAdminUser->setType(UTYPE_SUPERADMIN); + $sofabAdminUser->save(); + Logging::info($_SERVER['HTTP_HOST'] . ': ' . $this->getNewVersion() . " Upgrade: Promoted user " . $sofabAdminUser->getLogin() . " to be a Super Admin."); + } } } } @@ -275,40 +355,6 @@ class AirtimeUpgrader255 extends AirtimeUpgrader { public function getNewVersion() { return '2.5.5'; } - - public function upgrade($dir = __DIR__) { - Cache::clear(); - assert($this->checkIfUpgradeSupported()); - - $newVersion = $this->getNewVersion(); - - try { - $this->toggleMaintenanceScreen(true); - Cache::clear(); - - // Begin upgrade - $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; - $values = parse_ini_file($airtimeConf, true); - - $username = $values['database']['dbuser']; - $password = $values['database']['dbpass']; - $host = $values['database']['host']; - $database = $values['database']['dbname']; - - passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_" - .$this->getNewVersion()."/upgrade.sql $database 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); - - Application_Model_Preference::SetSchemaVersion($newVersion); - Cache::clear(); - - $this->toggleMaintenanceScreen(false); - - return true; - } catch(Exception $e) { - $this->toggleMaintenanceScreen(false); - throw $e; - } - } } class AirtimeUpgrader259 extends AirtimeUpgrader { @@ -321,38 +367,6 @@ class AirtimeUpgrader259 extends AirtimeUpgrader { public function getNewVersion() { return '2.5.9'; } - - public function upgrade($dir = __DIR__) { - Cache::clear(); - assert($this->checkIfUpgradeSupported()); - - $newVersion = $this->getNewVersion(); - - try { - $this->toggleMaintenanceScreen(true); - Cache::clear(); - - // Begin upgrade - $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; - $values = parse_ini_file($airtimeConf, true); - - $username = $values['database']['dbuser']; - $password = $values['database']['dbpass']; - $host = $values['database']['host']; - $database = $values['database']['dbname']; - - passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_" - .$this->getNewVersion()."/upgrade.sql $database 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); - - Application_Model_Preference::SetSchemaVersion($newVersion); - Cache::clear(); - - $this->toggleMaintenanceScreen(false); - } catch(Exception $e) { - $this->toggleMaintenanceScreen(false); - throw $e; - } - } } class AirtimeUpgrader2510 extends AirtimeUpgrader @@ -366,38 +380,6 @@ class AirtimeUpgrader2510 extends AirtimeUpgrader public function getNewVersion() { return '2.5.10'; } - - public function upgrade($dir = __DIR__) { - Cache::clear(); - assert($this->checkIfUpgradeSupported()); - - $newVersion = $this->getNewVersion(); - - try { - $this->toggleMaintenanceScreen(true); - Cache::clear(); - - // Begin upgrade - $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; - $values = parse_ini_file($airtimeConf, true); - - $username = $values['database']['dbuser']; - $password = $values['database']['dbpass']; - $host = $values['database']['host']; - $database = $values['database']['dbname']; - - passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_" - .$this->getNewVersion()."/upgrade.sql $database 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); - - Application_Model_Preference::SetSchemaVersion($newVersion); - Cache::clear(); - - $this->toggleMaintenanceScreen(false); - } catch(Exception $e) { - $this->toggleMaintenanceScreen(false); - throw $e; - } - } } class AirtimeUpgrader2511 extends AirtimeUpgrader @@ -412,35 +394,13 @@ class AirtimeUpgrader2511 extends AirtimeUpgrader return '2.5.11'; } - public function upgrade($dir = __DIR__) { - Cache::clear(); - assert($this->checkIfUpgradeSupported()); - - $newVersion = $this->getNewVersion(); - - try { - $this->toggleMaintenanceScreen(true); - Cache::clear(); - - // Begin upgrade - $queryResult = CcFilesQuery::create() - ->select(array('disk_usage')) - ->withColumn('SUM(CcFiles.filesize)', 'disk_usage') - ->find(); - $disk_usage = $queryResult[0]; - Application_Model_Preference::setDiskUsage($disk_usage); - - Application_Model_Preference::SetSchemaVersion($newVersion); - Cache::clear(); - - $this->toggleMaintenanceScreen(false); - } catch(Exception $e) { - $this->toggleMaintenanceScreen(false); - throw $e; - } - } - public function downgrade() { - + protected function _runUpgrade() { + $queryResult = CcFilesQuery::create() + ->select(array('disk_usage')) + ->withColumn('SUM(CcFiles.filesize)', 'disk_usage') + ->find(); + $disk_usage = $queryResult[0]; + Application_Model_Preference::setDiskUsage($disk_usage); } } @@ -456,39 +416,42 @@ class AirtimeUpgrader2512 extends AirtimeUpgrader public function getNewVersion() { return '2.5.12'; } +} - public function upgrade($dir = __DIR__) { - Cache::clear(); - assert($this->checkIfUpgradeSupported()); - - $newVersion = $this->getNewVersion(); - - try { - $this->toggleMaintenanceScreen(true); - Cache::clear(); - - // Begin upgrade - $airtimeConf = isset($_SERVER['AIRTIME_CONF']) ? $_SERVER['AIRTIME_CONF'] : "/etc/airtime/airtime.conf"; - $values = parse_ini_file($airtimeConf, true); - - $username = $values['database']['dbuser']; - $password = $values['database']['dbpass']; - $host = $values['database']['host']; - $database = $values['database']['dbname']; - - passthru("export PGPASSWORD=$password && psql -h $host -U $username -q -f $dir/upgrade_sql/airtime_" - .$this->getNewVersion()."/upgrade.sql $database 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); - - Application_Model_Preference::SetSchemaVersion($newVersion); - Cache::clear(); - - $this->toggleMaintenanceScreen(false); - } catch(Exception $e) { - $this->toggleMaintenanceScreen(false); - throw $e; - } +/** + * Class AirtimeUpgrader2513 - Celery and SoundCloud upgrade + * + * Adds third_party_track_references and celery_tasks tables for third party service + * authentication and task architecture. + * + *
third_party_track_references schema: + * + * id -> int PK + * service -> string internal service name + * foreign_id -> int external unique service id + * file_id -> int internal FK->cc_files track id + * upload_time -> timestamp internal upload timestamp + * status -> string external service status + * + *
celery_tasks schema: + * + * id -> int PK + * task_id -> string external unique amqp results identifier + * track_reference -> int internal FK->third_party_track_references id + * name -> string external Celery task name + * dispatch_time -> timestamp internal message dispatch time + * status -> string external Celery task status + * + */ +class AirtimeUpgrader2513 extends AirtimeUpgrader +{ + protected function getSupportedSchemaVersions() { + return array ( + '2.5.12' + ); } - public function downgrade() { + public function getNewVersion() { + return '2.5.13'; } } diff --git a/airtime_mvc/application/views/scripts/error/error-404.phtml b/airtime_mvc/application/views/scripts/error/error-404.phtml new file mode 100644 index 000000000..a63d44af8 --- /dev/null +++ b/airtime_mvc/application/views/scripts/error/error-404.phtml @@ -0,0 +1,18 @@ + + + + + <?php echo _("An error has occurred.") ?> + headLink(); ?> + + +
+

+

+
+ +
+
+ + diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml index b5b96cb55..58fd10ea2 100644 --- a/airtime_mvc/application/views/scripts/form/preferences.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences.phtml @@ -8,8 +8,10 @@ element->getSubform('preferences_tunein') ?> - - +

+
+ element->getSubform('preferences_soundcloud') ?> +

diff --git a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml index 4ee3ff7f0..2697a6508 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml @@ -1,112 +1,16 @@
-
- - element->getElement('UploadToSoundcloudOption')->hasErrors()) : ?> -
    - element->getElement('UploadToSoundcloudOption')->getMessages() as $error): ?> -
  • - -
- -
-
- - element->getElement('SoundCloudDownloadbleOption')->hasErrors()) : ?> -
    - element->getElement('SoundCloudDownloadbleOption')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('SoundCloudUser') ?> - element->getElement('SoundCloudUser')->hasErrors()) : ?> -
    - element->getElement('SoundCloudUser')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('SoundCloudPassword') ?> - element->getElement('SoundCloudPassword')->hasErrors()) : ?> -
    - element->getElement('SoundCloudPassword')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('SoundCloudTags') ?> - element->getElement('SoundCloudTags')->hasErrors()) : ?> -
    - element->getElement('SoundCloudTags')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('SoundCloudGenre') ?> - element->getElement('SoundCloudGenre')->hasErrors()) : ?> -
    - element->getElement('SoundCloudGenre')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('SoundCloudTrackType') ?> - element->getElement('SoundCloudTrackType')->hasErrors()) : ?> -
    - element->getElement('SoundCloudTrackType')->getMessages() as $error): ?> -
  • - -
- -
-
- -
-
- element->getElement('SoundCloudLicense') ?> - element->getElement('SoundCloudLicense')->hasErrors()) : ?> -
    - element->getElement('SoundCloudLicense')->getMessages() as $error): ?> -
  • - -
- -
+ hasAccessToken()) { + echo $this->element->getElement('SoundCloudDisconnect')->render(); + } else { + echo $this->element->getElement('SoundCloudConnect')->render(); + } + ?> + + element->getElement('SoundCloudLicense')->render() ?> + + element->getElement('SoundCloudSharing')->render() ?>
diff --git a/airtime_mvc/build/airtime-setup/forms/finish-settings.php b/airtime_mvc/build/airtime-setup/forms/finish-settings.php index d6b298c34..e08afe4fc 100644 --- a/airtime_mvc/build/airtime-setup/forms/finish-settings.php +++ b/airtime_mvc/build/airtime-setup/forms/finish-settings.php @@ -9,7 +9,8 @@

sudo service airtime-playout start
 sudo service airtime-liquidsoap start
-sudo service airtime-media-monitor start
+sudo service airtime_analyzer start +sudo service airtime-celery start

Click "Done!" to bring up the Airtime configuration checklist; if your configuration is all green, you're ready to get started with your personal Airtime station! diff --git a/airtime_mvc/build/airtime-setup/load.php b/airtime_mvc/build/airtime-setup/load.php index 722d6aec8..107b02b35 100644 --- a/airtime_mvc/build/airtime-setup/load.php +++ b/airtime_mvc/build/airtime-setup/load.php @@ -63,7 +63,7 @@ function checkDatabaseDependencies() { function checkExternalServices() { return array( "database" => checkDatabaseConfiguration(), - "media-monitor" => checkMediaMonitorService(), + "analyzer" => checkAnalyzerService(), "pypo" => checkPlayoutService(), "liquidsoap" => checkLiquidsoapService(), "rabbitmq" => checkRMQConnection() @@ -123,8 +123,8 @@ function checkRMQConnection() { * * @return boolean true if airtime-media-monitor is running */ -function checkMediaMonitorService() { - exec("pgrep -f -u www-data airtime-media-monitor", $out, $status); +function checkAnalyzerService() { + exec("pgrep -f -u www-data airtime_analyzer", $out, $status); if (array_key_exists(0, $out) && $status == 0) { return posix_kill(rtrim($out[0]), 0); } diff --git a/airtime_mvc/build/build.properties b/airtime_mvc/build/build.properties index ee5a5f8fa..556862bb1 100644 --- a/airtime_mvc/build/build.properties +++ b/airtime_mvc/build/build.properties @@ -1,6 +1,6 @@ #Note: project.home is automatically generated by the propel-install script. #Any manual changes to this value will be overwritten. -project.home = /home/sourcefabric/dev/Airtime-SaaS/Airtime/airtime_mvc +project.home = /home/sourcefabric/dev/Airtime/airtime_mvc project.build = ${project.home}/build #Database driver diff --git a/airtime_mvc/build/schema.xml b/airtime_mvc/build/schema.xml index ece788ea7..87f820cb6 100644 --- a/airtime_mvc/build/schema.xml +++ b/airtime_mvc/build/schema.xml @@ -531,4 +531,34 @@ + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + +
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql index 392539496..d358b5912 100644 --- a/airtime_mvc/build/sql/schema.sql +++ b/airtime_mvc/build/sql/schema.sql @@ -670,6 +670,42 @@ CREATE TABLE "cc_playout_history_template_field" PRIMARY KEY ("id") ); +----------------------------------------------------------------------- +-- third_party_track_references +----------------------------------------------------------------------- + +DROP TABLE IF EXISTS "third_party_track_references" CASCADE; + +CREATE TABLE "third_party_track_references" +( + "id" serial NOT NULL, + "service" VARCHAR(256) NOT NULL, + "foreign_id" VARCHAR(256), + "file_id" INTEGER NOT NULL, + "upload_time" TIMESTAMP, + "status" VARCHAR(256), + PRIMARY KEY ("id"), + CONSTRAINT "foreign_id_unique" UNIQUE ("foreign_id") +); + +----------------------------------------------------------------------- +-- celery_tasks +----------------------------------------------------------------------- + +DROP TABLE IF EXISTS "celery_tasks" CASCADE; + +CREATE TABLE "celery_tasks" +( + "id" serial NOT NULL, + "task_id" VARCHAR(256) NOT NULL, + "track_reference" INTEGER NOT NULL, + "name" VARCHAR(256), + "dispatch_time" TIMESTAMP, + "status" VARCHAR(256) NOT NULL, + PRIMARY KEY ("id"), + CONSTRAINT "id_unique" UNIQUE ("id") +); + ALTER TABLE "cc_files" ADD CONSTRAINT "cc_files_owner_fkey" FOREIGN KEY ("owner_id") REFERENCES "cc_subjs" ("id"); @@ -831,3 +867,13 @@ ALTER TABLE "cc_playout_history_template_field" ADD CONSTRAINT "cc_playout_histo FOREIGN KEY ("template_id") REFERENCES "cc_playout_history_template" ("id") ON DELETE CASCADE; + +ALTER TABLE "third_party_track_references" ADD CONSTRAINT "track_reference_fkey" + FOREIGN KEY ("file_id") + REFERENCES "cc_files" ("id") + ON DELETE CASCADE; + +ALTER TABLE "celery_tasks" ADD CONSTRAINT "celery_service_fkey" + FOREIGN KEY ("track_reference") + REFERENCES "third_party_track_references" ("id") + ON DELETE CASCADE; diff --git a/airtime_mvc/library/soundcloud-api/README.md b/airtime_mvc/library/soundcloud-api/README.md deleted file mode 100644 index 68df3a21a..000000000 --- a/airtime_mvc/library/soundcloud-api/README.md +++ /dev/null @@ -1,114 +0,0 @@ -# SoundCloud PHP API Wrapper - -## Introduction - -A wrapper for the SoundCloud API written in PHP with support for authentication using [OAuth 2.0](http://oauth.net/2/). - -The wrapper got a real overhaul with version 2.0. The current version was written with [PEAR](http://pear.php.net/) in mind and can easily by distributed as a PEAR package. - -## Getting started - -Check out the [getting started](https://github.com/mptre/php-soundcloud/wiki/OAuth-2) wiki entry for further reference on how to get started. Also make sure to check out the [demo application](https://github.com/mptre/ci-soundcloud) for some example code. - - -## Examples - -The wrapper includes convenient methods used to perform HTTP requests on behalf of the authenticated user. Below you'll find a few quick examples. - -Ofcourse you need to handle the authentication first before being able to request and modify protect resources as demonstrated below. Therefor I refer to the [demo application](https://github.com/mptre/ci-soundcloud) which got some example code on how to handle authentication. - -### GET - -

try {
-    $response = json_decode($soundcloud->get('me'), true);
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
-    exit($e->getMessage());
-}
- -### POST - -
$comment = <<<EOH
-<comment>
-    <body>Yeah!</body>
-</comment>
-EOH;
-
-try {
-    $response = json_decode(
-        $soundcloud->post(
-            'tracks/1/comments',
-            $comment,
-            array(CURLOPT_HTTPHEADER => array('Content-Type: application/xml'))
-        ),
-        true
-    );
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
-    exit($e->getMessage());
-}
- -### PUT - -
$track = <<<EOH
-<track>
-    <downloadable>true</downloadable>
-</track>
-EOH;
-
-try {
-    $response = json_decode(
-        $soundcloud->put(
-            'tracks/1',
-            $track,
-            array(CURLOPT_HTTPHEADER => array('Content-Type: application/xml'))
-        ),
-        true
-    );
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
-    exit($e->getMessage());
-}
- -### DELETE - -
try {
-    $response = json_decode($soundcloud->delete('tracks/1'), true);
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
-    exit($e->getMessage());
-}
- -### DOWNLOAD TRACK - -
try {
-    $track = $soundcloud->download(1337);
-} catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) {
-    exit($e->getMessage());
-}
-
-// do something clever with $track. Save to file perhaps?
- -## Feedback and questions - -Found a bug or missing a feature? Don't hesitate to create a new issue here on GitHub. Or contact me [directly](https://github.com/mptre). - -Also make sure to check out the official [documentation](https://github.com/soundcloud/api/wiki/) and the join [Google Group](https://groups.google.com/group/soundcloudapi?pli=1) in order to stay updated. - -## License - -Copyright (c) 2011 Anton Lindqvist - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE. diff --git a/airtime_mvc/library/soundcloud-api/Services/Soundcloud.php b/airtime_mvc/library/soundcloud-api/Services/Soundcloud.php deleted file mode 100644 index 9eba8eade..000000000 --- a/airtime_mvc/library/soundcloud-api/Services/Soundcloud.php +++ /dev/null @@ -1,737 +0,0 @@ - - * @copyright 2010 Anton Lindqvist - * @license http://www.opensource.org/licenses/mit-license.php MIT - * @link http://github.com/mptre/php-soundcloud - */ -class Services_Soundcloud { - - /** - * Custom cURL option. - * - * @access public - * - * @var integer - */ - const CURLOPT_OAUTH_TOKEN = 173; - - /** - * Access token returned by the service provider after a successful authentication. - * - * @access private - * - * @var string - */ - private $_accessToken; - - /** - * Version of the API to use. - * - * @access private - * - * @var integer - */ - private static $_apiVersion = 1; - - /** - * Supported audio MIME types. - * - * @access private - * - * @var array - */ - private static $_audioMimeTypes = array( - 'aac' => 'video/mp4', - 'aiff' => 'audio/x-aiff', - 'flac' => 'audio/flac', - 'mp3' => 'audio/mpeg', - 'ogg' => 'audio/ogg', - 'wav' => 'audio/x-wav' - ); - - /** - * OAuth client id. - * - * @access private - * - * @var string - */ - private $_clientId; - - /** - * OAuth client secret. - * - * @access private - * - * @var string - */ - private $_clientSecret; - - /** - * Development mode. - * - * @access private - * - * @var boolean - */ - private $_development; - - /** - * Available API domains. - * - * @access private - * - * @var array - */ - private static $_domains = array( - 'development' => 'sandbox-soundcloud.com', - 'production' => 'soundcloud.com' - ); - - /** - * HTTP response body from the last request. - * - * @access private - * - * @var string - */ - private $_lastHttpResponseBody; - - /** - * HTTP response code from the last request. - * - * @access private - * - * @var integer - */ - private $_lastHttpResponseCode; - - /** - * HTTP response headers from last request. - * - * @access private - * - * @var array - */ - private $_lastHttpResponseHeaders; - - /** - * OAuth paths. - * - * @access private - * - * @var array - */ - private static $_paths = array( - 'authorize' => 'connect', - 'access_token' => 'oauth2/token', - ); - - /** - * OAuth redirect uri. - * - * @access private - * - * @var string - */ - private $_redirectUri; - - /** - * API response format MIME type. - * - * @access private - * - * @var string - */ - private $_requestFormat; - - /** - * Available response formats. - * - * @access private - * - * @var array - */ - private static $_responseFormats = array( - '*' => '*/*', - 'json' => 'application/json', - 'xml' => 'application/xml' - ); - - /** - * HTTP user agent. - * - * @access private - * - * @var string - */ - private static $_userAgent = 'PHP-SoundCloud'; - - /** - * Class version. - * - * @var string - */ - public $version; - - /** - * Constructor. - * - * @param string $clientId OAuth client id - * @param string $clientSecret OAuth client secret - * @param string $redirectUri OAuth redirect uri - * @param boolean $development Sandbox mode - * - * @throws Services_Soundcloud_Missing_Client_Id_Exception when missing client id - * @return void - */ - function __construct($clientId, $clientSecret, $redirectUri = null, $development = false) { - if (empty($clientId)) { - throw new Services_Soundcloud_Missing_Client_Id_Exception(); - } - - $this->_clientId = $clientId; - $this->_clientSecret = $clientSecret; - $this->_redirectUri = $redirectUri; - $this->_development = $development; - $this->_responseFormat = self::$_responseFormats['json']; - $this->version = Services_Soundcloud_Version::get(); - } - - /** - * Get authorization URL. - * - * @param array $params Optional query string parameters - * - * @return string - * @see Soundcloud::_buildUrl() - */ - function getAuthorizeUrl($params = array()) { - $defaultParams = array( - 'client_id' => $this->_clientId, - 'redirect_uri' => $this->_redirectUri, - 'response_type' => 'code' - ); - $params = array_merge($defaultParams, $params); - - return $this->_buildUrl(self::$_paths['authorize'], $params, false); - } - - /** - * Get access token URL. - * - * @param array $params Optional query string parameters - * - * @return string - * @see Soundcloud::_buildUrl() - */ - function getAccessTokenUrl($params = array()) { - return $this->_buildUrl(self::$_paths['access_token'], $params, false); - } - - /** - * Retrieve access token. - * - * @param string $code OAuth code returned from the service provider - * @param array $postData Optional post data - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_getAccessToken() - */ - function accessToken($code, $postData = array(), $curlOptions = array()) { - $defaultPostData = array( - 'code' => $code, - 'client_id' => $this->_clientId, - 'client_secret' => $this->_clientSecret, - 'redirect_uri' => $this->_redirectUri, - 'grant_type' => 'authorization_code' - ); - $postData = array_merge($defaultPostData, $postData); - - return $this->_getAccessToken($postData, $curlOptions); - } - - /** - * Retrieve access token. - * - * @param string $username - * @param string $password - * @param array $postData Optional post data - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_getAccessToken() - */ - function accessTokenResourceOwner($username, $password, $postData = array(), $curlOptions = array()) { - $defaultPostData = array( - 'client_id' => $this->_clientId, - 'client_secret' => $this->_clientSecret, - 'grant_type' => 'password', - 'username' => $username, - 'password' => $password - ); - $postData = array_merge($defaultPostData, $postData); - - return $this->_getAccessToken($postData, $curlOptions); - } - - /** - * Refresh access token. - * - * @param string $refreshToken - * @param array $postData Optional post data - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_getAccessToken() - */ - function accessTokenRefresh($refreshToken, $postData = array(), $curlOptions = array()) { - $defaultPostData = array( - 'refresh_token' => $refreshToken, - 'client_id' => $this->_clientId, - 'client_secret' => $this->_clientSecret, - 'redirect_uri' => $this->_redirectUri, - 'grant_type' => 'refresh_token' - ); - $postData = array_merge($defaultPostData, $postData); - - return $this->_getAccessToken($postData, $curlOptions); - } - - /** - * Get access token. - * - * @return mixed - */ - function getAccessToken() { - return $this->_accessToken; - } - - /** - * Get API version. - * - * @return integer - */ - function getApiVersion() { - return self::$_apiVersion; - } - - /** - * Get the corresponding MIME type for a given file extension. - * - * @param string $extension - * - * @return string - * @throws Services_Soundcloud_Unsupported_Audio_Format_Exception if the format is unsupported - */ - function getAudioMimeType($extension) { - if (array_key_exists($extension, self::$_audioMimeTypes)) { - return self::$_audioMimeTypes[$extension]; - } else { - throw new Services_Soundcloud_Unsupported_Audio_Format_Exception(); - } - } - - /** - * Get development mode. - * - * @return boolean - */ - function getDevelopment() { - return $this->_development; - } - - /** - * Get HTTP response header. - * - * @param string $header Name of the header - * - * @return mixed - */ - function getHttpHeader($header) { - if (is_array($this->_lastHttpResponseHeaders) - && array_key_exists($header, $this->_lastHttpResponseHeaders) - ) { - return $this->_lastHttpResponseHeaders[$header]; - } else { - return false; - } - } - - /** - * Get redirect uri. - * - * @return mixed - */ - function getRedirectUri() { - return $this->_redirectUri; - } - - /** - * Get response format. - * - * @return string - */ - function getResponseFormat() { - return $this->_responseFormat; - } - - /** - * Set access token. - * - * @param string $accessToken - * - * @return object - */ - function setAccessToken($accessToken) { - $this->_accessToken = $accessToken; - - return $this; - } - - /** - * Set redirect uri. - * - * @param string $redirectUri - * - * @return object - */ - function setRedirectUri($redirectUri) { - $this->_redirectUri = $redirectUri; - - return $this; - } - - /** - * Set response format. - * - * @param string $format Could either be xml or json - * - * @throws Services_Soundcloud_Unsupported_Response_Format_Exception if the given response format isn't supported - * @return object - */ - function setResponseFormat($format) { - if (array_key_exists($format, self::$_responseFormats)) { - $this->_responseFormat = self::$_responseFormats[$format]; - } else { - throw new Services_Soundcloud_Unsupported_Response_Format_Exception(); - } - - return $this; - } - - /** - * Set development mode. - * - * @param boolean $development - * - * @return object - */ - function setDevelopment($development) { - $this->_development = $development; - - return $this; - } - - /** - * Send a GET HTTP request. - * - * @param string $path URI to request - * @param array $params Optional query string parameters - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_request() - */ - function get($path, $params = array(), $curlOptions = array()) { - $url = $this->_buildUrl($path, $params); - - return $this->_request($url, $curlOptions); - } - - /** - * Send a POST HTTP request. - * - * @param string $path URI to request - * @param array $postData Optional post data - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_request() - */ - function post($path, $postData = array(), $curlOptions = array()) { - $url = $this->_buildUrl($path); - $options = array(CURLOPT_POST => true, CURLOPT_POSTFIELDS => $postData); - $options += $curlOptions; - - return $this->_request($url, $options); - } - - /** - * Send a PUT HTTP request. - * - * @param string $path URI to request - * @param array $postData Optional post data - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_request() - */ - function put($path, $postData, $curlOptions = array()) { - $url = $this->_buildUrl($path); - $options = array( - CURLOPT_CUSTOMREQUEST => 'PUT', - CURLOPT_POSTFIELDS => $postData - ); - $options += $curlOptions; - - return $this->_request($url, $options); - } - - /** - * Send a DELETE HTTP request. - * - * @param string $path URI to request - * @param array $params Optional query string parameters - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_request() - */ - function delete($path, $params = array(), $curlOptions = array()) { - $url = $this->_buildUrl($path, $params); - $options = array(CURLOPT_CUSTOMREQUEST => 'DELETE'); - $options += $curlOptions; - - return $this->_request($url, $options); - } - - /** - * Download track. - * - * @param integer $trackId - * @param array Optional query string parameters - * @param array $curlOptions Optional cURL options - * - * @return mixed - * @see Soundcloud::_request() - */ - function download($trackId, $params = array(), $curlOptions = array()) { - $lastResponseFormat = array_pop( - preg_split('/\//', $this->getResponseFormat()) - ); - $defaultParams = array('oauth_token' => $this->getAccessToken()); - $defaultCurlOptions = array( - CURLOPT_FOLLOWLOCATION => true, - self::CURLOPT_OAUTH_TOKEN => false - ); - $url = $this->_buildUrl( - 'tracks/' . $trackId . '/download', - array_merge($defaultParams, $params) - ); - $options = $defaultCurlOptions + $curlOptions; - - $this->setResponseFormat('*'); - - $response = $this->_request($url, $options); - - // rollback to the previously defined response format. - $this->setResponseFormat($lastResponseFormat); - - return $response; - } - - /** - * Construct default HTTP headers including response format and authorization. - * - * @param boolean Include access token or not - * - * @return array $headers - */ - protected function _buildDefaultHeaders($includeAccessToken = true) { - $headers = array(); - - if ($this->_responseFormat) { - array_push($headers, 'Accept: ' . $this->_responseFormat); - } - - if ($includeAccessToken && $this->_accessToken) { - array_push($headers, 'Authorization: OAuth ' . $this->_accessToken); - } - - return $headers; - } - - /** - * Construct a URL. - * - * @param string $path Relative or absolute URI - * @param array $params Optional query string parameters - * @param boolean $includeVersion Include API version - * - * @return string $url - */ - protected function _buildUrl($path, $params = null, $includeVersion = true) { - if (preg_match('/^https?\:\/\//', $path)) { - $url = $path; - } else { - $url = 'https://'; - $url .= (!preg_match('/connect/', $path)) ? 'api.' : ''; - $url .= ($this->_development) - ? self::$_domains['development'] - : self::$_domains['production']; - $url .= '/'; - $url .= ($includeVersion) ? 'v' . self::$_apiVersion . '/' : ''; - $url .= $path; - } - - $url .= (count($params)) ? '?' . http_build_query($params) : ''; - - return $url; - } - - /** - * Retrieve access token. - * - * @param array $postData Post data - * @param array $curlOptions Optional cURL options - * - * @return mixed - */ - protected function _getAccessToken($postData, $curlOptions = array()) { - $options = array(CURLOPT_POST => true, CURLOPT_POSTFIELDS => $postData); - $options += $curlOptions; - $response = json_decode( - $this->_request($this->getAccessTokenUrl(), $options), - true - ); - - if (array_key_exists('access_token', $response)) { - $this->_accessToken = $response['access_token']; - - return $response; - } else { - return false; - } - } - - /** - * Get HTTP user agent. - * - * @access protected - * - * @return string - */ - protected function _getUserAgent() { - return self::$_userAgent . '/' . $this->version; - } - - /** - * Parse HTTP response headers. - * - * @param string $headers - * - * @return array - */ - protected function _parseHttpHeaders($headers) { - $headers = preg_split('/\n/', trim($headers)); - $parsedHeaders = array(); - - foreach ($headers as $header) { - if (!preg_match('/\:\s/', $header)) { - continue; - } - - list($key, $val) = preg_split('/\:\s/', $header, 2); - $key = str_replace('-', '_', strtolower($key)); - $val = trim($val); - - $parsedHeaders[$key] = $val; - } - - return $parsedHeaders; - } - - /** - * Validates HTTP response code. - * - * @access protected - * - * @return boolean - */ - protected function _validResponseCode($code) { - return (bool)preg_match('/^20[0-9]{1}$/', $code); - } - - /** - * Performs the actual HTTP request using curl. Can be overwritten by extending classes. - * - * @access protected - * - * @param string $url - * @param array $curlOptions Optional cURL options - * - * @throws Services_Soundcloud_Invalid_Http_Response_Code_Exception if the response code isn't valid - * @return mixed - */ - protected function _request($url, $curlOptions = array()) { - $ch = curl_init(); - $options = array( - CURLOPT_URL => $url, - CURLOPT_HEADER => true, - CURLOPT_RETURNTRANSFER => true, - CURLOPT_USERAGENT => $this->_getUserAgent() - ); - $options += $curlOptions; - - if (array_key_exists(self::CURLOPT_OAUTH_TOKEN, $options)) { - $includeAccessToken = $options[self::CURLOPT_OAUTH_TOKEN]; - unset($options[self::CURLOPT_OAUTH_TOKEN]); - } else { - $includeAccessToken = true; - } - - if (array_key_exists(CURLOPT_HTTPHEADER, $options)) { - $options[CURLOPT_HTTPHEADER] = array_merge( - $this->_buildDefaultHeaders(), - $curlOptions[CURLOPT_HTTPHEADER] - ); - } else { - $options[CURLOPT_HTTPHEADER] = $this->_buildDefaultHeaders($includeAccessToken); - } - - curl_setopt_array($ch, $options); - - $data = curl_exec($ch); - $info = curl_getinfo($ch); - - curl_close($ch); - - $this->_lastHttpResponseHeaders = $this->_parseHttpHeaders( - substr($data, 0, $info['header_size']) - ); - $this->_lastHttpResponseBody = substr($data, $info['header_size']); - $this->_lastHttpResponseCode = $info['http_code']; - - if ($this->_validResponseCode($this->_lastHttpResponseCode)) { - return $this->_lastHttpResponseBody; - } else { - throw new Services_Soundcloud_Invalid_Http_Response_Code_Exception( - null, - 0, - $this->_lastHttpResponseBody, - $this->_lastHttpResponseCode - ); - } - } - -} diff --git a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Exception.php b/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Exception.php deleted file mode 100644 index 76e3370ad..000000000 --- a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Exception.php +++ /dev/null @@ -1,146 +0,0 @@ - - * @copyright 2010 Anton Lindqvist - * @license http://www.opensource.org/licenses/mit-license.php MIT - * @link http://github.com/mptre/php-soundcloud - */ -class Services_Soundcloud_Missing_Client_Id_Exception extends Exception { - - /** - * Default message. - * - * @access protected - * - * @var string - */ - protected $message = 'All requests must include a consumer key. Referred to as client_id in OAuth2.'; - -} - -/** - * Soundcloud invalid HTTP response code exception. - * - * @category Services - * @package Services_Soundcloud - * @author Anton Lindqvist - * @copyright 2010 Anton Lindqvist - * @license http://www.opensource.org/licenses/mit-license.php MIT - * @link http://github.com/mptre/php-soundcloud - */ -class Services_Soundcloud_Invalid_Http_Response_Code_Exception extends Exception { - - /** - * HTTP response body. - * - * @access protected - * - * @var string - */ - protected $httpBody; - - /** - * HTTP response code. - * - * @access protected - * - * @var integer - */ - protected $httpCode; - - /** - * Default message. - * - * @access protected - * - * @var string - */ - protected $message = 'The requested URL responded with HTTP code %d.'; - - /** - * Constructor. - * - * @param string $message - * @param string $code - * @param string $httpBody - * @param integer $httpCode - * - * @return void - */ - function __construct($message = null, $code = 0, $httpBody = null, $httpCode = 0) { - $this->httpBody = $httpBody; - $this->httpCode = $httpCode; - $message = sprintf($this->message, $httpCode); - - parent::__construct($message, $code); - } - - /** - * Get HTTP response body. - * - * @return mixed - */ - function getHttpBody() { - return $this->httpBody; - } - - /** - * Get HTTP response code. - * - * @return mixed - */ - function getHttpCode() { - return $this->httpCode; - } - -} - -/** - * Soundcloud unsupported response format exception. - * - * @category Services - * @package Services_Soundcloud - * @author Anton Lindqvist - * @copyright 2010 Anton Lindqvist - * @license http://www.opensource.org/licenses/mit-license.php MIT - * @link http://github.com/mptre/php-soundcloud - */ -class Services_Soundcloud_Unsupported_Response_Format_Exception extends Exception { - - /** - * Default message. - * - * @access protected - * - * @var string - */ - protected $message = 'The given response format is unsupported.'; - -} - -/** - * Soundcloud unsupported audio format exception. - * - * @category Services - * @package Services_Soundcloud - * @author Anton Lindqvist - * @copyright 2010 Anton Lindqvist - * @license http://www.opensource.org/licenses/mit-license.php MIT - * @link http://github.com/mptre/php-soundcloud - */ -class Services_Soundcloud_Unsupported_Audio_Format_Exception extends Exception { - - /** - * Default message. - * - * @access protected - * - * @var string - */ - protected $message = 'The given audio format is unsupported.'; - -} diff --git a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Version.php b/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Version.php deleted file mode 100644 index 6ee964a23..000000000 --- a/airtime_mvc/library/soundcloud-api/Services/Soundcloud/Version.php +++ /dev/null @@ -1,22 +0,0 @@ - - * @copyright 2010 Anton Lindqvist - * @license http://www.opensource.org/licenses/mit-license.php MIT - * @link http://github.com/mptre/php-soundcloud - */ -class Services_Soundcloud_Version { - - const MAJOR = 2; - const MINOR = 1; - const PATCH = 1; - - public static function get() { - return implode('.', array(self::MAJOR, self::MINOR, self::PATCH)); - } - -} diff --git a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test.php b/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test.php deleted file mode 100644 index cfc3e9c4a..000000000 --- a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test.php +++ /dev/null @@ -1,310 +0,0 @@ -soundcloud = new Services_Soundcloud_Expose( - '1337', - '1337', - 'http://soundcloud.local/callback' - ); - } - - function tearDown() { - $this->soundcloud = null; - } - - function testVersionFormat() { - $this->assertRegExp( - '/^[0-9]+\.[0-9]+\.[0-9]+$/', - Services_Soundcloud_Version::get() - ); - } - - function testGetUserAgent() { - $this->assertRegExp( - '/^PHP\-SoundCloud\/[0-9]+\.[0-9]+\.[0-9]+$/', - $this->soundcloud->getUserAgent() - ); - } - - function testApiVersion() { - $this->assertEquals(1, $this->soundcloud->getApiVersion()); - } - - function testGetAudioMimeTypes() { - $supportedExtensions = array( - 'aac' => 'video/mp4', - 'aiff' => 'audio/x-aiff', - 'flac' => 'audio/flac', - 'mp3' => 'audio/mpeg', - 'ogg' => 'audio/ogg', - 'wav' => 'audio/x-wav' - ); - $unsupportedExtensions = array('gif', 'html', 'jpg', 'mp4', 'xml', 'xspf'); - - foreach ($supportedExtensions as $extension => $mimeType) { - $this->assertEquals( - $mimeType, - $this->soundcloud->getAudioMimeType($extension) - ); - } - - foreach ($unsupportedExtensions as $extension => $mimeType) { - $this->setExpectedException('Services_Soundcloud_Unsupported_Audio_Format_Exception'); - - $this->soundcloud->getAudioMimeType($extension); - } - } - - function testGetAuthorizeUrl() { - $this->assertEquals( - 'https://soundcloud.com/connect?client_id=1337&redirect_uri=http%3A%2F%2Fsoundcloud.local%2Fcallback&response_type=code', - $this->soundcloud->getAuthorizeUrl() - ); - } - - function testGetAuthorizeUrlWithCustomQueryParameters() { - $this->assertEquals( - 'https://soundcloud.com/connect?client_id=1337&redirect_uri=http%3A%2F%2Fsoundcloud.local%2Fcallback&response_type=code&foo=bar', - $this->soundcloud->getAuthorizeUrl(array('foo' => 'bar')) - ); - - $this->assertEquals( - 'https://soundcloud.com/connect?client_id=1337&redirect_uri=http%3A%2F%2Fsoundcloud.local%2Fcallback&response_type=code&foo=bar&bar=foo', - $this->soundcloud->getAuthorizeUrl(array('foo' => 'bar', 'bar' => 'foo')) - ); - } - - function testGetAccessTokenUrl() { - $this->assertEquals( - 'https://api.soundcloud.com/oauth2/token', - $this->soundcloud->getAccessTokenUrl() - ); - } - - function testSetAccessToken() { - $this->soundcloud->setAccessToken('1337'); - - $this->assertEquals('1337', $this->soundcloud->getAccessToken()); - } - - function testSetDevelopment() { - $this->soundcloud->setDevelopment(true); - - $this->assertTrue($this->soundcloud->getDevelopment()); - } - - function testSetRedirectUri() { - $this->soundcloud->setRedirectUri('http://soundcloud.local/callback'); - - $this->assertEquals( - 'http://soundcloud.local/callback', - $this->soundcloud->getRedirectUri() - ); - } - - function testDefaultResponseFormat() { - $this->assertEquals( - 'application/json', - $this->soundcloud->getResponseFormat() - ); - } - - function testSetResponseFormatHtml() { - $this->setExpectedException('Services_Soundcloud_Unsupported_Response_Format_Exception'); - - $this->soundcloud->setResponseFormat('html'); - } - - function testSetResponseFormatAll() { - $this->soundcloud->setResponseFormat('*'); - - $this->assertEquals( - '*/*', - $this->soundcloud->getResponseFormat() - ); - } - - function testSetResponseFormatJson() { - $this->soundcloud->setResponseFormat('json'); - - $this->assertEquals( - 'application/json', - $this->soundcloud->getResponseFormat() - ); - } - - function testSetResponseFormatXml() { - $this->soundcloud->setResponseFormat('xml'); - - $this->assertEquals( - 'application/xml', - $this->soundcloud->getResponseFormat() - ); - } - - function testResponseCodeSuccess() { - $this->assertTrue($this->soundcloud->validResponseCode(200)); - } - - function testResponseCodeRedirect() { - $this->assertFalse($this->soundcloud->validResponseCode(301)); - } - - function testResponseCodeClientError() { - $this->assertFalse($this->soundcloud->validResponseCode(400)); - } - - function testResponseCodeServerError() { - $this->assertFalse($this->soundcloud->validResponseCode(500)); - } - - function testBuildDefaultHeaders() { - $this->assertEquals( - array('Accept: application/json'), - $this->soundcloud->buildDefaultHeaders() - ); - } - - function testBuildDefaultHeadersWithAccessToken() { - $this->soundcloud->setAccessToken('1337'); - - $this->assertEquals( - array('Accept: application/json', 'Authorization: OAuth 1337'), - $this->soundcloud->buildDefaultHeaders() - ); - } - - function testBuildUrl() { - $this->assertEquals( - 'https://api.soundcloud.com/v1/me', - $this->soundcloud->buildUrl('me') - ); - } - - function testBuildUrlWithQueryParameters() { - $this->assertEquals( - 'https://api.soundcloud.com/v1/tracks?q=rofl+dubstep', - $this->soundcloud->buildUrl( - 'tracks', - array('q' => 'rofl dubstep') - ) - ); - - $this->assertEquals( - 'https://api.soundcloud.com/v1/tracks?q=rofl+dubstep&filter=public', - $this->soundcloud->buildUrl( - 'tracks', - array('q' => 'rofl dubstep', 'filter' => 'public') - ) - ); - } - - function testBuildUrlWithDevelopmentDomain() { - $this->soundcloud->setDevelopment(true); - - $this->assertEquals( - 'https://api.sandbox-soundcloud.com/v1/me', - $this->soundcloud->buildUrl('me') - ); - } - - function testBuildUrlWithoutApiVersion() { - $this->assertEquals( - 'https://api.soundcloud.com/me', - $this->soundcloud->buildUrl('me', null, false) - ); - } - - function testBuildUrlWithAbsoluteUrl() { - $this->assertEquals( - 'https://api.soundcloud.com/me', - $this->soundcloud->buildUrl('https://api.soundcloud.com/me') - ); - } - - /** - * @dataProvider dataProviderHttpHeaders - */ - function testParseHttpHeaders($rawHeaders, $expectedHeaders) { - $parsedHeaders = $this->soundcloud->parseHttpHeaders($rawHeaders); - - foreach ($parsedHeaders as $key => $val) { - $this->assertEquals($val, $expectedHeaders[$key]); - } - } - - function testSoundcloudMissingConsumerKeyException() { - $this->setExpectedException('Services_Soundcloud_Missing_Client_Id_Exception'); - - $soundcloud = new Services_Soundcloud('', ''); - } - - function testSoundcloudInvalidHttpResponseCodeException() { - $this->setExpectedException('Services_Soundcloud_Invalid_Http_Response_Code_Exception'); - - $this->soundcloud->get('me'); - } - - /** - * @dataProvider dataProviderSoundcloudInvalidHttpResponseCode - */ - function testSoundcloudInvalidHttpResponseCode($expectedHeaders) { - try { - $this->soundcloud->get('me'); - } catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) { - $this->assertEquals( - '{"error":"401 - Unauthorized"}', - $e->getHttpBody() - ); - - $this->assertEquals(401, $e->getHttpCode()); - - foreach ($expectedHeaders as $key => $val) { - $this->assertEquals( - $val, - $this->soundcloud->getHttpHeader($key) - ); - } - } - } - - static function dataProviderHttpHeaders() { - $rawHeaders = << 'Wed, 17 Nov 2010 15:39:52 GMT', - 'cache_control' => 'public', - 'content_type' => 'text/html; charset=utf-8', - 'content_encoding' => 'gzip', - 'server' => 'foobar', - 'content_length' => '1337' - ); - - return array(array($rawHeaders, $expectedHeaders)); - } - - static function dataProviderSoundcloudInvalidHttpResponseCode() { - $expectedHeaders = array( - 'server' => 'nginx', - 'content_type' => 'application/json; charset=utf-8', - 'connection' => 'keep-alive', - 'cache_control' => 'no-cache', - 'content_length' => '30' - ); - - return array(array($expectedHeaders)); - } - -} diff --git a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test_Helper.php b/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test_Helper.php deleted file mode 100644 index 2959d0813..000000000 --- a/airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test_Helper.php +++ /dev/null @@ -1,94 +0,0 @@ - - * @copyright 2010 Anton Lindqvist - * @license http://www.opensource.org/licenses/mit-license.php MIT - * @link http://github.com/mptre/php-soundcloud - */ -class Services_Soundcloud_Expose extends Services_Soundcloud { - - /** - * Class constructor. See parent constructor for further reference. - * - * @param string $clientId Application client id - * @param string $clientSecret Application client secret - * @param string $redirectUri Application redirect uri - * @param boolean $development Sandbox mode - * - * @return void - * @see Soundcloud - */ - function __construct($clientId, $clientSecret, $redirectUri = null, $development = false) { - parent::__construct($clientId, $clientSecret, $redirectUri, $development); - } - - /** - * Construct default http headers including response format and authorization. - * - * @return array - * @see Soundcloud::_buildDefaultHeaders() - */ - function buildDefaultHeaders() { - return $this->_buildDefaultHeaders(); - } - - /** - * Construct a url. - * - * @param string $path Relative or absolute uri - * @param array $params Optional query string parameters - * @param boolean $includeVersion Include the api version - * - * @return string - * @see Soundcloud::_buildUrl() - */ - function buildUrl($path, $params = null, $includeVersion = true) { - return $this->_buildUrl($path, $params, $includeVersion); - } - - /** - * Get http user agent. - * - * @return string - * @see Soundcloud::_getUserAgent() - */ - function getUserAgent() { - return $this->_getUserAgent(); - } - - /** - * Parse HTTP response headers. - * - * @param string $headers - * - * @return array - * @see Soundcloud::_parseHttpHeaders() - */ - function parseHttpHeaders($headers) { - return $this->_parseHttpHeaders($headers); - } - - /** - * Validates http response code. - * - * @return boolean - * @see Soundcloud::_validResponseCode() - */ - function validResponseCode($code) { - return $this->_validResponseCode($code); - } - -} diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css index cf13b0f6d..f815ec819 100644 --- a/airtime_mvc/public/css/styles.css +++ b/airtime_mvc/public/css/styles.css @@ -1250,7 +1250,7 @@ input[type="checkbox"] { } .dataTables_scrolling { - min-height: 150px; + /*min-height: 150px;*/ } .ui-dialog #schedule_playlist_dialog.ui-dialog-content { diff --git a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js index 315caf986..d44cd1707 100644 --- a/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js +++ b/airtime_mvc/public/js/airtime/library/events/library_showbuilder.js @@ -10,7 +10,8 @@ var AIRTIME = (function(AIRTIME) { mod.checkAddButton = function() { var selected = mod.getChosenItemsLength(), $cursor = $('tr.sb-selected'), check = false, shows = $('tr.sb-header'), current = $('tr.sb-current-show'), - cursorText = $.i18n._('Add to next show'); + // TODO: this is an ugly way of doing this... we should find a more robust way of checking which view we're in. + cursorText = (window.location.href.toLowerCase().indexOf("schedule") > -1) ? $.i18n._('Add to show') : $.i18n._('Add to next show'); // make sure library items are selected and a cursor is selected. if (selected !== 0) { diff --git a/airtime_mvc/public/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index ae6ce7d11..0e4d97723 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -614,17 +614,6 @@ var AIRTIME = (function(AIRTIME) { }, "fnRowCallback": AIRTIME.library.fnRowCallback, "fnCreatedRow": function( nRow, aData, iDataIndex ) { - //add soundcloud icon - if (aData.soundcloud_id !== undefined) { - if (aData.soundcloud_id === "-2") { - $(nRow).find("td.library_title").append(''); - } else if (aData.soundcloud_id === "-3") { - $(nRow).find("td.library_title").append(''); - } else if (aData.soundcloud_id !== null) { - $(nRow).find("td.library_title").append(''); - } - } - // add checkbox $(nRow).find('td.library_checkbox').html(""); @@ -903,10 +892,6 @@ var AIRTIME = (function(AIRTIME) { }); - checkLibrarySCUploadStatus(); - - addQtipToSCIcons(); - // begin context menu initialization. $.contextMenu({ selector: '#library_display td:not(.library_checkbox)', @@ -1037,21 +1022,31 @@ var AIRTIME = (function(AIRTIME) { // add callbacks for Soundcloud menu items. if (oItems.soundcloud !== undefined) { var soundcloud = oItems.soundcloud.items; - + // define an upload to soundcloud callback. if (soundcloud.upload !== undefined) { - + callback = function() { - $.post(soundcloud.upload.url, function(){ - addProgressIcon(data.id); - }); + alert($.i18n._("Your track is being uploaded and will " + + "appear on SoundCloud in a couple of minutes")); + $.post(soundcloud.upload.url, function(){}); }; soundcloud.upload.callback = callback; } - + + // define an upload to soundcloud callback. + if (soundcloud.remove !== undefined) { + + callback = function() { + alert($.i18n._("Your track is being deleted from SoundCloud")); + $.post(soundcloud.remove.url, function(){}); + }; + soundcloud.remove.callback = callback; + } + // define a view on soundcloud callback if (soundcloud.view !== undefined) { - + callback = function() { window.open(soundcloud.view.url); }; @@ -1151,122 +1146,6 @@ function addProgressIcon(id) { } } -function checkLibrarySCUploadStatus(){ - var url = baseUrl+'Library/get-upload-to-soundcloud-status', - span, - id; - - function checkSCUploadStatusCallback(json) { - - if (json.sc_id > 0) { - span.removeClass("progress").addClass("soundcloud"); - - } - else if (json.sc_id == "-3") { - span.removeClass("progress").addClass("sc-error"); - } - } - - function checkSCUploadStatusRequest() { - - span = $(this); - id = span.parents("tr").data("aData").id; - - $.post(url, {format: "json", id: id, type:"file"}, checkSCUploadStatusCallback); - } - - $("#library_display span.progress").each(checkSCUploadStatusRequest); - setTimeout(checkLibrarySCUploadStatus, 5000); -} - -function addQtipToSCIcons() { - $("#content") - .on('mouseover', ".progress, .soundcloud, .sc-error", function() { - - var aData = $(this).parents("tr").data("aData"), - id = aData.id, - sc_id = aData.soundcloud_id; - - if ($(this).hasClass("progress")){ - $(this).qtip({ - content: { - text: $.i18n._("Uploading in progress...") - }, - position:{ - adjust: { - resize: true, - method: "flip flip" - }, - at: "right center", - my: "left top", - viewport: $(window) - }, - style: { - classes: "ui-tooltip-dark file-md-long" - }, - show: { - ready: true // Needed to make it show on first mouseover event - } - }); - } - else if ($(this).hasClass("soundcloud")){ - - $(this).qtip({ - content: { - text: $.i18n._("The soundcloud id for this file is: ") + sc_id - }, - position:{ - adjust: { - resize: true, - method: "flip flip" - }, - at: "right center", - my: "left top", - viewport: $(window) - }, - style: { - classes: "ui-tooltip-dark file-md-long" - }, - show: { - ready: true // Needed to make it show on first mouseover event - } - }); - } - else if ($(this).hasClass("sc-error")) { - $(this).qtip({ - content: { - text: $.i18n._("Retreiving data from the server..."), - ajax: { - url: baseUrl+"Library/get-upload-to-soundcloud-status", - type: "post", - data: ({format: "json", id : id, type: "file"}), - success: function(json, status){ - this.set('content.text', $.i18n._("There was an error while uploading to soundcloud.")+"
"+ - $.i18n._("Error code: ")+json.error_code+ - "
"+$.i18n._("Error msg: ")+json.error_msg+"
"); - } - } - }, - position:{ - adjust: { - resize: true, - method: "flip flip" - }, - at: "right center", - my: "left top", - viewport: $(window) - }, - style: { - classes: "ui-tooltip-dark file-md-long" - }, - show: { - ready: true // Needed to make it show on first mouseover event - } - }); - } - }); -} - /* * This function is called from dataTables.columnFilter.js */ diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js index aeb6e27e7..91a9bef3a 100644 --- a/airtime_mvc/public/js/airtime/preferences/preferences.js +++ b/airtime_mvc/public/js/airtime/preferences/preferences.js @@ -82,6 +82,20 @@ function setTuneInSettingsReadonly() { } } +function setSoundCloudSettingsListener() { + var connect = $("#SoundCloudConnect"), + disconnect = $("#SoundCloudDisconnect"); + connect.click(function(e){ + e.preventDefault(); + window.location.replace(baseUrl + "soundcloud/authorize"); + }); + + disconnect.click(function(e){ + e.preventDefault(); + window.location.replace(baseUrl + "soundcloud/deauthorize"); + }); +} + /* * Enable/disable mail server authentication fields */ @@ -147,4 +161,5 @@ $(document).ready(function() { setEnableSystemEmailsListener(); setTuneInSettingsReadonly(); setTuneInSettingsListener(); + setSoundCloudSettingsListener(); }); diff --git a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js index 0a3ae1b3b..f51b7d8fe 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -194,31 +194,6 @@ function eventRender(event, element, view) { $(element).find(".fc-event-content").append(div); } - - //add the record/rebroadcast/soundcloud icons if needed - if (event.record === 1) { - if (view.name === 'agendaDay' || view.name === 'agendaWeek') { - if (event.soundcloud_id === -1) { - $(element).find(".fc-event-time").before(''); - } else if ( event.soundcloud_id > 0) { - $(element).find(".fc-event-time").before(''); - } else if (event.soundcloud_id === -2) { - $(element).find(".fc-event-time").before(''); - } else if (event.soundcloud_id === -3) { - $(element).find(".fc-event-time").before(''); - } - } else if (view.name === 'month') { - if(event.soundcloud_id === -1) { - $(element).find(".fc-event-title").after(''); - } else if (event.soundcloud_id > 0) { - $(element).find(".fc-event-title").after(''); - } else if (event.soundcloud_id === -2) { - $(element).find(".fc-event-title").after(''); - } else if (event.soundcloud_id === -3) { - $(element).find(".fc-event-title").after(''); - } - } - } if (event.record === 0 && event.rebroadcast === 0) { if (view.name === 'agendaDay' || view.name === 'agendaWeek') { diff --git a/airtime_mvc/public/js/airtime/schedule/schedule.js b/airtime_mvc/public/js/airtime/schedule/schedule.js index bf2937bcd..e85d47be2 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -63,25 +63,6 @@ function confirmCancelRecordedShow(show_instance_id){ } } -function uploadToSoundCloud(show_instance_id, el){ - - var url = baseUrl+"Schedule/upload-to-sound-cloud", - $el = $(el), - $span = $el.find(".soundcloud"); - - $.post(url, {id: show_instance_id, format: "json"}); - - //first upload to soundcloud. - if ($span.length === 0){ - $span = $("", {"class": "progress"}); - - $el.find(".fc-event-title").after($span); - } - else { - $span.removeClass("soundcloud").addClass("progress"); - } -} - function checkCalendarSCUploadStatus(){ var url = baseUrl+'Library/get-upload-to-soundcloud-status', span, @@ -421,24 +402,6 @@ $(document).ready(function() { oItems.content.callback = callback; } - //define a soundcloud upload callback. - if (oItems.soundcloud_upload !== undefined) { - - callback = function() { - uploadToSoundCloud(data.id, this.context); - }; - oItems.soundcloud_upload.callback = callback; - } - - //define a view on soundcloud callback. - if (oItems.soundcloud_view !== undefined) { - - callback = function() { - window.open(oItems.soundcloud_view.url); - }; - oItems.soundcloud_view.callback = callback; - } - //define a cancel recorded show callback. if (oItems.cancel_recorded !== undefined) { diff --git a/airtime_mvc/public/js/airtime/showbuilder/builder.js b/airtime_mvc/public/js/airtime/showbuilder/builder.js index 35c6d3002..d46d0aade 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -12,7 +12,8 @@ var AIRTIME = (function(AIRTIME){ cursors = [], cursorIds = [], showInstanceIds = [], - headerFooter = []; + headerFooter = [], + DISABLED_CLASS = 'ui-state-disabled'; if (AIRTIME.showbuilder === undefined) { AIRTIME.showbuilder = {}; @@ -135,8 +136,7 @@ var AIRTIME = (function(AIRTIME){ mod.checkDeleteButton = function() { var $selected = $sbTable.find("tbody").find("input:checkbox").filter(":checked"); - var button = $("#show_builder").find(".icon-trash").parent(), - DISABLED_CLASS = 'ui-state-disabled'; + var button = $("#show_builder").find(".icon-trash").parent(); if ($selected.length !== 0) { button.removeClass(DISABLED_CLASS); button.removeAttr('disabled'); @@ -535,9 +535,6 @@ var AIRTIME = (function(AIRTIME){ cl = 'sb-header'; if (aData.record === true) { - - headerIcon = (aData.soundcloud_id > 0) ? "soundcloud" : "recording"; - $div = $("
", { "class": "small-icon " + headerIcon }); @@ -1191,8 +1188,10 @@ var AIRTIME = (function(AIRTIME){ //delete selected tracks $toolbar.find('.icon-trash').parent() .click(function() { - - if (AIRTIME.button.isDisabled('icon-trash', true) === true) { + + var button = $("#show_builder").find(".icon-trash").parent(); + + if (button.hasClass(DISABLED_CLASS)) { return; } diff --git a/airtime_mvc/public/setup/database-setup.php b/airtime_mvc/public/setup/database-setup.php index 821f549cf..f09b3a7ed 100644 --- a/airtime_mvc/public/setup/database-setup.php +++ b/airtime_mvc/public/setup/database-setup.php @@ -9,7 +9,7 @@ class DatabaseSetup extends Setup { // airtime.conf section header - const SECTION = "[database]"; + protected static $_settings = "[database]"; // Constant form field names for passing errors back to the front-end const DB_USER = "dbUser", @@ -17,31 +17,26 @@ class DatabaseSetup extends Setup { DB_NAME = "dbName", DB_HOST = "dbHost"; - // Form field values - private $user, $pass, $name, $host; - // Array of key->value pairs for airtime.conf - static $properties; + protected static $_properties; + /** + * @var PDO + */ static $dbh = null; public function __construct($settings) { - $this->user = $settings[self::DB_USER]; - $this->pass = $settings[self::DB_PASS]; - $this->name = $settings[self::DB_NAME]; - $this->host = $settings[self::DB_HOST]; - - self::$properties = array( - "host" => $this->host, - "dbname" => $this->name, - "dbuser" => $this->user, - "dbpass" => $this->pass, + static::$_properties = array( + "host" => $settings[self::DB_HOST], + "dbname" => $settings[self::DB_NAME], + "dbuser" => $settings[self::DB_USER], + "dbpass" => $settings[self::DB_PASS], ); } private function setNewDatabaseConnection($dbName) { - self::$dbh = new PDO("pgsql:host=" . $this->host . ";dbname=" . $dbName . ";port=5432" - . ";user=" . $this->user . ";password=" . $this->pass); + self::$dbh = new PDO("pgsql:host=" . self::$_properties["host"] . ";dbname=" . $dbName . ";port=5432" + . ";user=" . self::$_properties["dbuser"] . ";password=" . self::$_properties["dbpass"]); $err = self::$dbh->errorInfo(); if ($err[1] != null) { throw new PDOException(); @@ -69,11 +64,7 @@ class DatabaseSetup extends Setup { throw new AirtimeDatabaseException("Couldn't establish a connection to the database! " . "Please check your credentials and try again. " . "PDO Exception: " . $e->getMessage(), - array( - self::DB_NAME, - self::DB_USER, - self::DB_PASS, - )); + array(self::DB_NAME, self::DB_USER, self::DB_PASS)); } $this->writeToTemp(); @@ -85,13 +76,9 @@ class DatabaseSetup extends Setup { ); } - protected function writeToTemp() { - parent::writeToTemp(self::SECTION, self::$properties); - } - private function installDatabaseTables() { $this->checkDatabaseEncoding(); - $this->setNewDatabaseConnection($this->name); + $this->setNewDatabaseConnection(self::$_properties["dbname"]); $this->checkSchemaExists(); $this->createDatabaseTables(); } @@ -102,7 +89,7 @@ class DatabaseSetup extends Setup { */ private function checkDatabaseExists() { $statement = self::$dbh->prepare("SELECT datname FROM pg_database WHERE datname = :dbname"); - $statement->execute(array(":dbname" => $this->name)); + $statement->execute(array(":dbname" => self::$_properties["dbname"])); $result = $statement->fetch(); return isset($result[0]); } @@ -126,16 +113,13 @@ class DatabaseSetup extends Setup { */ private function checkUserCanCreateDb() { $statement = self::$dbh->prepare("SELECT 1 FROM pg_roles WHERE rolname=:dbuser AND rolcreatedb='t'"); - $statement->execute(array(":dbuser" => $this->user)); + $statement->execute(array(":dbuser" => self::$_properties["dbuser"])); $result = $statement->fetch(); if (!isset($result[0])) { - throw new AirtimeDatabaseException("No database " . $this->name . " exists; user '" . $this->user - . "' does not have permission to create databases on " . $this->host, - array( - self::DB_NAME, - self::DB_USER, - self::DB_PASS, - )); + throw new AirtimeDatabaseException("No database " . self::$_properties["dbname"] . " exists; user '" + . self::$_properties["dbuser"] . "' does not have permission to " + . "create databases on " . self::$_properties["host"], + array(self::DB_NAME, self::DB_USER, self::DB_PASS)); } } @@ -144,9 +128,9 @@ class DatabaseSetup extends Setup { * @throws AirtimeDatabaseException */ private function createDatabase() { - $statement = self::$dbh->prepare("CREATE DATABASE " . pg_escape_string($this->name) + $statement = self::$dbh->prepare("CREATE DATABASE " . pg_escape_string(self::$_properties["dbname"]) . " WITH ENCODING 'UTF8' TEMPLATE template0" - . " OWNER " . pg_escape_string($this->user)); + . " OWNER " . pg_escape_string(self::$_properties["dbuser"])); if (!$statement->execute()) { throw new AirtimeDatabaseException("There was an error creating the database!", array(self::DB_NAME,)); @@ -169,8 +153,9 @@ class DatabaseSetup extends Setup { * have multiple issues; they similarly die on any SQL errors, fail to read in multi-line * commands, and fail on any unescaped ? or $ characters. */ - exec("export PGPASSWORD=" . $this->pass . " && psql -U " . $this->user . " --dbname " - . $this->name . " -h " . $this->host . " -f $sqlDir$f 2>/dev/null", $out, $status); + exec("export PGPASSWORD=" . self::$_properties["dbpass"] . " && psql -U " . self::$_properties["dbuser"] + . " --dbname " . self::$_properties["dbname"] . " -h " . self::$_properties["host"] + . " -f $sqlDir$f 2>/dev/null", $out, $status); } catch (Exception $e) { throw new AirtimeDatabaseException("There was an error setting up the Airtime schema!", array(self::DB_NAME,)); @@ -185,7 +170,7 @@ class DatabaseSetup extends Setup { private function checkDatabaseEncoding() { $statement = self::$dbh->prepare("SELECT pg_encoding_to_char(encoding) " . "FROM pg_database WHERE datname = :dbname"); - $statement->execute(array(":dbname" => $this->name)); + $statement->execute(array(":dbname" => self::$_properties["dbname"])); $encoding = $statement->fetch(); if (!($encoding && $encoding[0] == "UTF8")) { throw new AirtimeDatabaseException("The database was installed with an incorrect encoding type!", diff --git a/airtime_mvc/public/setup/general-setup.php b/airtime_mvc/public/setup/general-setup.php index f63a84f90..7e86bdb69 100644 --- a/airtime_mvc/public/setup/general-setup.php +++ b/airtime_mvc/public/setup/general-setup.php @@ -11,37 +11,28 @@ class GeneralSetup extends Setup { // airtime.conf section header - const SECTION = "[general]"; + protected static $_section = "[general]"; // Constant form field names for passing errors back to the front-end const GENERAL_PORT = "generalPort", GENERAL_HOST = "generalHost"; - // Form field values - static $user, $host, $port, $root; - // Array of key->value pairs for airtime.conf - static $properties; + protected static $_properties; // Message and error fields to return to the front-end static $message = null; static $errors = array(); function __construct($settings) { - self::$host = $settings[self::GENERAL_HOST]; - self::$port = $settings[self::GENERAL_PORT]; - self::$properties = array( + self::$_properties = array( "api_key" => $this->generateRandomString(), - "base_url" => self::$host, - "base_port" => self::$port, + "base_url" => $settings[self::GENERAL_HOST], + "base_port" => $settings[self::GENERAL_PORT], ); } - function writeToTemp() { - parent::writeToTemp(self::SECTION, self::$properties); - } - /** * @return array associative array containing a display message and fields with errors */ diff --git a/airtime_mvc/public/setup/media-setup.php b/airtime_mvc/public/setup/media-setup.php index d2cb99edc..701ba0749 100644 --- a/airtime_mvc/public/setup/media-setup.php +++ b/airtime_mvc/public/setup/media-setup.php @@ -26,7 +26,9 @@ class MediaSetup extends Setup { const MEDIA_FOLDER = "mediaFolder"; const AIRTIME_CONF_PATH = "/etc/airtime/airtime.conf"; - + const RMQ_INI_BASE_PATH = "/etc/airtime-saas/"; + const RMQ_INI_FILE_NAME = "rabbitmq-analyzer.ini"; + static $path; static $message = null; static $errors = array(); @@ -62,10 +64,14 @@ class MediaSetup extends Setup { // Finalize and move airtime.conf.temp if (file_exists("/etc/airtime/")) { if (!$this->moveAirtimeConfig()) { - $message = "Error moving airtime.conf or deleting /tmp/airtime.conf.temp!"; - $errors[] = "ERR"; + self::$message = "Error moving airtime.conf or deleting /tmp/airtime.conf.temp!"; + self::$errors[] = "ERR"; } - + if (!$this->moveRmqConfig()) { + self::$message = "Error moving rabbitmq-analyzer.ini or deleting /tmp/rabbitmq.ini.tmp!"; + self::$errors[] = "ERR"; + } + /* * If we're upgrading from an old Airtime instance (pre-2.5.2) we rename their old * airtime.conf to airtime.conf.tmp during the setup process. Now that we're done, @@ -75,8 +81,8 @@ class MediaSetup extends Setup { rename(self::AIRTIME_CONF_PATH . ".tmp", self::AIRTIME_CONF_PATH . ".bak"); } } else { - $message = "Failed to move airtime.conf; /etc/airtime doesn't exist!"; - $errors[] = "ERR"; + self::$message = "Failed to move airtime.conf; /etc/airtime doesn't exist!"; + self::$errors[] = "ERR"; } return array( @@ -84,7 +90,7 @@ class MediaSetup extends Setup { "errors" => self::$errors ); } - + /** * Moves /tmp/airtime.conf.temp to /etc/airtime.conf and then removes it to complete setup * @return boolean false if either of the copy or removal operations fail @@ -94,6 +100,16 @@ class MediaSetup extends Setup { && unlink(AIRTIME_CONF_TEMP_PATH); } + /** + * Moves /tmp/airtime.conf.temp to /etc/airtime.conf and then removes it to complete setup + * @return boolean false if either of the copy or removal operations fail + */ + function moveRmqConfig() { + return copy(RMQ_INI_TEMP_PATH, self::RMQ_INI_BASE_PATH . self::RMQ_INI_FILE_NAME) + && copy(RMQ_INI_TEMP_PATH, self::RMQ_INI_BASE_PATH . "production/" . self::RMQ_INI_FILE_NAME) + && unlink(RMQ_INI_TEMP_PATH); + } + /** * Add the given directory to cc_music_dirs * TODO Should we check for an existing entry in cc_music_dirs? diff --git a/airtime_mvc/public/setup/rabbitmq-setup.php b/airtime_mvc/public/setup/rabbitmq-setup.php index 817b51742..e8d210fec 100644 --- a/airtime_mvc/public/setup/rabbitmq-setup.php +++ b/airtime_mvc/public/setup/rabbitmq-setup.php @@ -13,7 +13,10 @@ require_once dirname(dirname( __DIR__)) . '/library/php-amqplib/amqp.inc'; class RabbitMQSetup extends Setup { // airtime.conf section header - const SECTION = "[rabbitmq]"; + protected static $_section = "[rabbitmq]"; + + // Array of key->value pairs for airtime.conf + protected static $_properties; // Constant form field names for passing errors back to the front-end const RMQ_USER = "rmqUser", @@ -22,29 +25,17 @@ class RabbitMQSetup extends Setup { RMQ_HOST = "rmqHost", RMQ_VHOST = "rmqVHost"; - // Form field values - static $user, $pass, $host, $port, $vhost; - - // Array of key->value pairs for airtime.conf - static $properties; - // Message and error fields to return to the front-end static $message = null; static $errors = array(); function __construct($settings) { - self::$user = $settings[self::RMQ_USER]; - self::$pass = $settings[self::RMQ_PASS]; - self::$port = $settings[self::RMQ_PORT]; - self::$host = $settings[self::RMQ_HOST]; - self::$vhost = $settings[self::RMQ_VHOST]; - - self::$properties = array( - "host" => self::$host, - "port" => self::$port, - "user" => self::$user, - "password" => self::$pass, - "vhost" => self::$vhost, + static::$_properties = array( + "host" => $settings[self::RMQ_HOST], + "port" => $settings[self::RMQ_PORT], + "user" => $settings[self::RMQ_USER], + "password" => $settings[self::RMQ_PASS], + "vhost" => $settings[self::RMQ_VHOST], ); } @@ -72,24 +63,20 @@ class RabbitMQSetup extends Setup { ); } - function writeToTemp() { - parent::writeToTemp(self::SECTION, self::$properties); - } - function checkRMQConnection() { - $conn = new AMQPConnection(self::$host, - self::$port, - self::$user, - self::$pass, - self::$vhost); + $conn = new AMQPConnection(self::$_properties["host"], + self::$_properties["port"], + self::$_properties["user"], + self::$_properties["password"], + self::$_properties["vhost"]); return isset($conn); } function identifyRMQConnectionError() { // It's impossible to identify errors coming out of amqp.inc without a major // rewrite, so for now just tell the user ALL THE THINGS went wrong - self::$message = "Couldn't connect to RabbitMQ server! Please check if the server " - . "is running and your credentials are correct."; + self::$message = _("Couldn't connect to RabbitMQ server! Please check if the server " + . "is running and your credentials are correct."); self::$errors[] = self::RMQ_USER; self::$errors[] = self::RMQ_PASS; self::$errors[] = self::RMQ_HOST; @@ -97,4 +84,12 @@ class RabbitMQSetup extends Setup { self::$errors[] = self::RMQ_VHOST; } + protected function writeToTemp() { + if (!file_exists(RMQ_INI_TEMP_PATH)) { + copy(BUILD_PATH . "rabbitmq-analyzer.ini", RMQ_INI_TEMP_PATH); + } + $this->_write(RMQ_INI_TEMP_PATH); + parent::writeToTemp(); + } + } \ No newline at end of file diff --git a/airtime_mvc/public/setup/setup-functions.php b/airtime_mvc/public/setup/setup-functions.php index 36d96265e..3e226b848 100644 --- a/airtime_mvc/public/setup/setup-functions.php +++ b/airtime_mvc/public/setup/setup-functions.php @@ -1,6 +1,7 @@ value pairs for airtime.conf + * + * @var array + */ + protected static $_properties; + abstract function __construct($settings); abstract function runSetup(); /** * Write new property values to a given section in airtime.conf.temp - * - * @param string $section - * the configuration section to write to - * @param array $properties - * the configuration properties and values to overwrite */ - protected function writeToTemp($section, $properties) { + protected function writeToTemp() { if (!file_exists(AIRTIME_CONF_TEMP_PATH)) { copy(BUILD_PATH . "airtime.example.conf", AIRTIME_CONF_TEMP_PATH); } - - $file = file(AIRTIME_CONF_TEMP_PATH); + + $this->_write(AIRTIME_CONF_TEMP_PATH); + } + + protected function _write($filePath) { + $file = file($filePath); $fileOutput = ""; - + $inSection = false; - + foreach ($file as $line) { - if (strpos($line, $section) !== false) { + if (strpos($line, static::$_section) !== false) { $inSection = true; } else if (strpos($line, "[") !== false) { $inSection = false; } - + if (substr(trim($line), 0, 1) == "#") { /* Workaround to strip comments from airtime.conf. * We need to do this because python's ConfigObj and PHP - * have different (and equally strict) rules about comment + * have different (and equally strict) rules about comment * characters in configuration files. */ } else if ($inSection) { $key = trim(@substr($line, 0, strpos($line, "="))); - $fileOutput .= $key && isset($properties[$key]) ? $key . " = " . $properties[$key] . "\n" : $line; + $fileOutput .= $key && isset(static::$_properties[$key]) ? + $key . " = " . static::$_properties[$key] . "\n" : $line; } else { $fileOutput .= $line; } } - - file_put_contents(AIRTIME_CONF_TEMP_PATH, $fileOutput); + + file_put_contents($filePath, $fileOutput); } /** diff --git a/airtime_mvc/tests/airtime.conf b/airtime_mvc/tests/airtime.conf index fb19bcaa0..431d3f2c2 100644 --- a/airtime_mvc/tests/airtime.conf +++ b/airtime_mvc/tests/airtime.conf @@ -19,6 +19,7 @@ base_url = localhost base_port = 80 base_dir = / cache_ahead_hours = 1 +station_id = teststation [monit] monit_user = guest diff --git a/composer.json b/composer.json index 6d92538de..4b4827efd 100644 --- a/composer.json +++ b/composer.json @@ -2,6 +2,8 @@ "require": { "propel/propel1": "1.7.0-stable", "aws/aws-sdk-php": "2.7.9", - "raven/raven": "0.8.x-dev" + "raven/raven": "0.8.x-dev", + "ise/php-soundcloud": "3.0.1", + "massivescale/celery-php": "2.0.*@dev" } } diff --git a/composer.lock b/composer.lock index 17d9b1085..528dcf222 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "30ad5215f679ce0ab55c7210b21a3b32", + "hash": "8a3acbb09ff4547ccbbeb6ec2ee893f8", "packages": [ { "name": "aws/aws-sdk-php", @@ -165,6 +165,107 @@ ], "time": "2014-08-11 04:32:36" }, + { + "name": "ise/php-soundcloud", + "version": "3.0.1", + "source": { + "type": "git", + "url": "https://github.com/internalsystemerror/php-soundcloud.git", + "reference": "ac3ff2dce2a6e6d34636c58e66fd316d722c31df" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/internalsystemerror/php-soundcloud/zipball/ac3ff2dce2a6e6d34636c58e66fd316d722c31df", + "reference": "ac3ff2dce2a6e6d34636c58e66fd316d722c31df", + "shasum": "" + }, + "require": { + "php": ">=5.3" + }, + "type": "library", + "autoload": { + "psr-0": { + "Soundcloud\\": "src/", + "SoundcloudTest\\": "tests/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Anton Lindqvist", + "email": "anton@qvister.se", + "homepage": "http://qvister.se/", + "role": "developer" + }, + { + "name": "Gary Lockett", + "email": "ise@garylockett.com", + "homepage": "http://www.garylockett.com/" + } + ], + "description": "API Wrapper for SoundCloud written in PHP with support for authentication using OAuth 2.0 by Anton Lindqvist (mptre), composer support added by Gary Lockett (ise)", + "homepage": "https://github.com/internalsystemerror/php-soundcloud", + "keywords": [ + "soundcloud" + ], + "time": "2014-02-03 15:49:00" + }, + { + "name": "massivescale/celery-php", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/gjedeer/celery-php.git", + "reference": "609720abe0683ffd3c5d2dfc8a898a79b687f599" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/gjedeer/celery-php/zipball/609720abe0683ffd3c5d2dfc8a898a79b687f599", + "reference": "609720abe0683ffd3c5d2dfc8a898a79b687f599", + "shasum": "" + }, + "require": { + "predis/predis": "0.8.5", + "videlalvaro/php-amqplib": ">=2.4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "celery.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-2-Clause" + ], + "authors": [ + { + "name": "GDR!", + "email": "info@massivescale.net", + "homepage": "http://massivescale.net/", + "role": "Developer" + } + ], + "description": "PHP client for Celery task queue", + "homepage": "https://github.com/gjedeer/celery-php/", + "keywords": [ + "AMQP", + "celery", + "cron", + "python", + "queue", + "task" + ], + "time": "2015-04-17 10:58:54" + }, { "name": "phing/phing", "version": "2.9.1", @@ -254,6 +355,53 @@ ], "time": "2014-12-03 09:18:46" }, + { + "name": "predis/predis", + "version": "v0.8.5", + "source": { + "type": "git", + "url": "https://github.com/nrk/predis.git", + "reference": "5f2eea628eb465d866ad2771927d83769c8f956c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nrk/predis/zipball/5f2eea628eb465d866ad2771927d83769c8f956c", + "reference": "5f2eea628eb465d866ad2771927d83769c8f956c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "suggest": { + "ext-curl": "Allows access to Webdis when paired with phpiredis", + "ext-phpiredis": "Allows faster serialization and deserialization of the Redis protocol" + }, + "type": "library", + "autoload": { + "psr-0": { + "Predis": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniele Alessandri", + "email": "suppakilla@gmail.com", + "homepage": "http://clorophilla.net" + } + ], + "description": "Flexible and feature-complete PHP client library for Redis", + "homepage": "http://github.com/nrk/predis", + "keywords": [ + "nosql", + "predis", + "redis" + ], + "time": "2014-01-16 14:10:29" + }, { "name": "propel/propel1", "version": "1.7.0", @@ -426,13 +574,68 @@ "description": "Symfony EventDispatcher Component", "homepage": "http://symfony.com", "time": "2015-01-05 14:28:40" + }, + { + "name": "videlalvaro/php-amqplib", + "version": "v2.5.0", + "source": { + "type": "git", + "url": "https://github.com/videlalvaro/php-amqplib.git", + "reference": "7989ddce7c4aa6038483d8999b12d3b1f7c81ff9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/videlalvaro/php-amqplib/zipball/7989ddce7c4aa6038483d8999b12d3b1f7c81ff9", + "reference": "7989ddce7c4aa6038483d8999b12d3b1f7c81ff9", + "shasum": "" + }, + "require": { + "ext-bcmath": "*", + "ext-mbstring": "*", + "php": ">=5.3.0" + }, + "require-dev": { + "phpunit/phpunit": "3.7.*" + }, + "suggest": { + "ext-sockets": "Use AMQPSocketConnection" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.4-dev" + } + }, + "autoload": { + "psr-0": { + "PhpAmqpLib": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "LGPL-2.1" + ], + "authors": [ + { + "name": "Alvaro Videla" + } + ], + "description": "This library is a pure PHP implementation of the AMQP protocol. It's been tested against RabbitMQ.", + "homepage": "https://github.com/videlalvaro/php-amqplib/", + "keywords": [ + "message", + "queue", + "rabbitmq" + ], + "time": "2015-02-18 18:16:04" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "raven/raven": 20 + "raven/raven": 20, + "massivescale/celery-php": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/install b/install index 0cae36632..999501670 100755 --- a/install +++ b/install @@ -320,9 +320,10 @@ if [ -f /etc/airtime/airtime.conf ]; then set +e verbose "Stopping airtime services..." - loudCmd "service airtime-playout stop-with-monit" - loudCmd "service airtime-media-monitor stop-with-monit" - loudCmd "service airtime-liquidsoap stop-with-monit" + loudCmd "service airtime-playout stop" + loudCmd "service airtime-media-monitor stop" + loudCmd "service airtime_analyzer stop" + loudCmd "service airtime-liquidsoap stop" verbose "...Done" echo "Looks like you have an old version of Airtime. Your current /etc/airtime/airtime.conf \ @@ -332,7 +333,7 @@ will be moved to /etc/airtime/airtime.conf.tmp" if [ -d /usr/lib/airtime/ ]; then rm -rf /usr/lib/airtime/ fi - + rm /etc/init.d/airtime-* if [ "$apache" = "t" ]; then @@ -459,12 +460,16 @@ verbose "\n * Installing API client..." loudCmd "python ${AIRTIMEROOT}/python_apps/api_clients/setup.py install --install-scripts=/usr/bin" verbose "...Done" -verbose "\n * Installing media-monitor..." -loudCmd "python ${AIRTIMEROOT}/python_apps/media-monitor/setup.py install --install-scripts=/usr/bin" +verbose "\n * Installing pypo and liquidsoap..." +loudCmd "python ${AIRTIMEROOT}/python_apps/pypo/setup.py install --install-scripts=/usr/bin" verbose "...Done" -verbose "\n * Installing pypo..." -loudCmd "python ${AIRTIMEROOT}/python_apps/pypo/setup.py install --install-scripts=/usr/bin" +verbose "\n * Installing airtime-celery..." +loudCmd "python ${AIRTIMEROOT}/python_apps/airtime-celery/setup.py install" +verbose "...Done" + +verbose "\n * Installing airtime_analyzer..." +loudCmd "python ${AIRTIMEROOT}/python_apps/airtime_analyzer/setup.py install --install-scripts=/usr/bin" verbose "...Done" #for i in /etc/init/airtime*.template; do @@ -476,9 +481,10 @@ verbose "...Done" set +e loudCmd "initctl reload-configuration" loudCmd "systemctl daemon-reload" #systemd hipsters -loudCmd "update-rc.d airtime-playout defaults" # Start at bootup, on Debian -loudCmd "update-rc.d airtime-media-monitor defaults" # Start at bootup, on Debian -loudCmd "update-rc.d airtime-liquidsoap defaults" # Start at bootup, on Debian +loudCmd "update-rc.d airtime-playout defaults" # Start at bootup, on Debian +loudCmd "update-rc.d airtime-celery defaults" # Start at bootup, on Debian +loudCmd "update-rc.d airtime-liquidsoap defaults" # Start at bootup, on Debian +loudCmd "update-rc.d airtime_analyzer defaults" # Start at bootup, on Debian set -e if [ ! -d /var/log/airtime ]; then @@ -566,7 +572,8 @@ else fi verbose "\n * Setting RabbitMQ user permissions..." -loudCmd "rabbitmqctl set_permissions -p ${RABBITMQ_VHOST} ${RABBITMQ_USER} \"$EXCHANGES\" \"$EXCHANGES\" \"$EXCHANGES\"" +#loudCmd "rabbitmqctl set_permissions -p ${RABBITMQ_VHOST} ${RABBITMQ_USER} \"$EXCHANGES\" \"$EXCHANGES\" \"$EXCHANGES\"" +loudCmd "rabbitmqctl set_permissions -p ${RABBITMQ_VHOST} ${RABBITMQ_USER} .\* .\* .\*" if [ ! -d "/etc/airtime" ]; then loud "\n-----------------------------------------------------" @@ -575,8 +582,12 @@ if [ ! -d "/etc/airtime" ]; then verbose "\n * Creating /etc/airtime/ directory..." mkdir /etc/airtime + verbose "\n * Creating /etc/airtime-saas/ directory..." + # Default saas directory for the analyzer, cloud storage, and celery + mkdir -p /etc/airtime-saas/production fi chown -R ${web_user}:${web_user} /etc/airtime +chown -R ${web_user}:${web_user} /etc/airtime-saas if [ ! -d "/srv/airtime" ]; then mkdir -p /srv/airtime diff --git a/python_apps/airtime-celery/MANIFEST.in b/python_apps/airtime-celery/MANIFEST.in new file mode 100644 index 000000000..9561fb106 --- /dev/null +++ b/python_apps/airtime-celery/MANIFEST.in @@ -0,0 +1 @@ +include README.rst diff --git a/python_apps/airtime-celery/README.rst b/python_apps/airtime-celery/README.rst new file mode 100644 index 000000000..78df52a42 --- /dev/null +++ b/python_apps/airtime-celery/README.rst @@ -0,0 +1,65 @@ +airtime-celery +============== + +airtime-celery is a Celery_ daemon for handling backend tasks asynchronously. +Communication and the Celery results backend are both handled with amqp (RabbitMQ). + +Installation +============ + + $ sudo python setup.py install + +Each instance of airtime-celery has its own worker, and multiple instances can be run in parallel. +`Celery is thread-safe`_, so this parallelization won't cause conflicts. + +.. _Celery: http://www.celeryproject.org/ +.. _Celery is thread-safe: http://celery.readthedocs.org/en/latest/userguide/application.html + +Usage +===== + +This program must be run with sudo: + + $ sudo service airtime-celery {start | stop | restart | graceful | kill | dryrun | create-paths} + +Developers +========== + +To debug, you can run celery directly from the command line: + + $ cd /my/airtime/root/python_apps/airtime-celery + $ RMQ_CONFIG_FILE=/etc/airtime/airtime.conf celery -A airtime-celery.tasks worker --loglevel=info + +This worker can be run alongside the service without issue. + +You may want to use the setuptools develop target to install: + + $ cd /my/airtime/root/python_apps/airtime-celery + $ sudo python setup.py develop + +You will need to allow the "airtime" RabbitMQ user to access all exchanges and queues within the /airtime vhost: + + $ sudo rabbitmqctl set_permissions -p /airtime airtime .\* .\* .\* + +Logging +======= + +By default, logs are saved to: + + /var/log/airtime/airtime-celery[-DEV_ENV].log + +Troubleshooting +=============== + +If you run into issues getting Celery to accept tasks from Airtime: + + 1) Make sure Celery is running ($ sudo service airtime-celery status). + + 2) Check the log file (/var/log/airtime/airtime-celery[-DEV_ENV].log) to make sure Celery started correctly. + + 3) Check your /etc/airtime/airtime.conf rabbitmq settings. Make sure the settings here align with + /etc/airtime-saas/production/rabbitmq.ini. + + 4) Check RabbitMQ to make sure the celeryresults and task queues were created in the correct vhost. + + 5) Make sure the RabbitMQ user (the default is airtime) has permissions on all vhosts being used. diff --git a/python_apps/airtime-celery/airtime-celery/__init__.py b/python_apps/airtime-celery/airtime-celery/__init__.py new file mode 100644 index 000000000..a65fa3c85 --- /dev/null +++ b/python_apps/airtime-celery/airtime-celery/__init__.py @@ -0,0 +1,3 @@ +import os +# Make the celeryconfig module visible to celery +os.environ['CELERY_CONFIG_MODULE'] = 'airtime-celery.celeryconfig' \ No newline at end of file diff --git a/python_apps/airtime-celery/airtime-celery/celeryconfig.py b/python_apps/airtime-celery/airtime-celery/celeryconfig.py new file mode 100644 index 000000000..da43f1e77 --- /dev/null +++ b/python_apps/airtime-celery/airtime-celery/celeryconfig.py @@ -0,0 +1,41 @@ +import os +from configobj import ConfigObj +from kombu import Exchange, Queue + +# Get the broker string from airtime.conf +RMQ_CONFIG_SECTION = "rabbitmq" + + +def get_rmq_broker(): + rmq_config = ConfigObj(os.environ['RMQ_CONFIG_FILE']) + rmq_settings = parse_rmq_config(rmq_config) + return 'amqp://{username}:{password}@{host}:{port}/{vhost}'.format(**rmq_settings) + + +def parse_rmq_config(rmq_config): + return { + 'host' : rmq_config[RMQ_CONFIG_SECTION]['host'], + 'port' : rmq_config[RMQ_CONFIG_SECTION]['port'], + 'username': rmq_config[RMQ_CONFIG_SECTION]['user'], + 'password': rmq_config[RMQ_CONFIG_SECTION]['password'], + 'vhost' : rmq_config[RMQ_CONFIG_SECTION]['vhost'] + } + +# Celery amqp settings +BROKER_URL = get_rmq_broker() +CELERY_RESULT_BACKEND = 'amqp' # Use RabbitMQ as the celery backend +CELERY_RESULT_PERSISTENT = True # Persist through a broker restart +CELERY_TASK_RESULT_EXPIRES = 600 # Expire task results after 10 minutes +CELERY_RESULT_EXCHANGE = 'celeryresults' # Default exchange - needed due to php-celery +CELERY_QUEUES = ( + Queue('soundcloud', exchange=Exchange('soundcloud'), routing_key='soundcloud'), + Queue(exchange=Exchange('celeryresults'), auto_delete=True), +) +CELERY_EVENT_QUEUE_EXPIRES = 600 # RabbitMQ x-expire after 10 minutes + +# Celery task settings +CELERY_TASK_SERIALIZER = 'json' +CELERY_RESULT_SERIALIZER = 'json' +CELERY_ACCEPT_CONTENT = ['json'] +CELERY_TIMEZONE = 'Europe/Berlin' +CELERY_ENABLE_UTC = True diff --git a/python_apps/airtime-celery/airtime-celery/tasks.py b/python_apps/airtime-celery/airtime-celery/tasks.py new file mode 100644 index 000000000..27554241a --- /dev/null +++ b/python_apps/airtime-celery/airtime-celery/tasks.py @@ -0,0 +1,53 @@ +import os +import json +import urllib2 +import soundcloud +from celery import Celery +from celery.utils.log import get_task_logger + +celery = Celery() +logger = get_task_logger(__name__) + + +@celery.task(name='soundcloud-upload', acks_late=True) +def soundcloud_upload(data, token, file_path): + """ + Upload a file to SoundCloud + + :param data: associative array containing SoundCloud metadata + :param token: OAuth2 client access token + :param file_path: path to the file being uploaded + + :return: the SoundCloud response object + :rtype: dict + """ + client = soundcloud.Client(access_token=token) + # Open the file with urllib2 if it's a cloud file + data['asset_data'] = open(file_path, 'rb') if os.path.isfile(file_path) else urllib2.urlopen(file_path) + try: + logger.info('Uploading track: {0}'.format(data)) + track = client.post('/tracks', track=data) + except Exception as e: + logger.info('Error uploading track {title}: {0}'.format(e.message, **data)) + raise e + data['asset_data'].close() + return json.dumps(track.fields()) + +@celery.task(name='soundcloud-delete', acks_late=True) +def soundcloud_delete(token, track_id): + """ + Delete a file from SoundCloud + + :param token: OAuth2 client access token + + :return: the SoundCloud response object + :rtype: dict + """ + client = soundcloud.Client(access_token=token) + try: + logger.info('Deleting track with ID {0}'.format(track_id)) + track = client.delete('/tracks/%s' % track_id) + except Exception as e: + logger.info('Error deleting track!') + raise e + return json.dumps(track.fields()) diff --git a/python_apps/airtime-celery/install/conf/airtime-celery b/python_apps/airtime-celery/install/conf/airtime-celery new file mode 100644 index 000000000..3b1206738 --- /dev/null +++ b/python_apps/airtime-celery/install/conf/airtime-celery @@ -0,0 +1,25 @@ +# Names of nodes to start +CELERYD_NODES="airtime-celery" + +# Absolute or relative path to the 'celery' command: +CELERY_BIN="/usr/local/bin/celery" + +# App instance to use +CELERY_APP="airtime-celery.tasks:celery" + +# Extra command-line arguments to the worker +CELERYD_OPTS="--time-limit=300 --concurrency=1 --config=celeryconfig" + +# %N will be replaced with the first part of the nodename. +CELERYD_LOG_FILE="/var/log/airtime/%N.log" +CELERYD_PID_FILE="/var/run/celery/%N.pid" + +# Workers should run as an unprivileged user. +# You need to create this user manually (or you can choose +# a user/group combination that already exists, e.g. nobody). +CELERYD_USER="celery" +CELERYD_GROUP="celery" + +# If enabled pid and log directories will be created if missing, +# and owned by the userid/group configured. +CELERY_CREATE_DIRS=1 diff --git a/python_apps/airtime-celery/install/initd/airtime-celery b/python_apps/airtime-celery/install/initd/airtime-celery new file mode 100644 index 000000000..d4f6ae89e --- /dev/null +++ b/python_apps/airtime-celery/install/initd/airtime-celery @@ -0,0 +1,334 @@ +#!/bin/sh -e +# ============================================ +# celeryd - Starts the Celery worker daemon. +# ============================================ +# +# :Usage: /etc/init.d/celeryd {start|stop|force-reload|restart|try-restart|status} +# :Configuration file: /etc/default/celeryd +# +# See http://docs.celeryproject.org/en/latest/tutorials/daemonizing.html#generic-init-scripts + + +### BEGIN INIT INFO +# Provides: celeryd +# Required-Start: $network $local_fs $remote_fs +# Required-Stop: $network $local_fs $remote_fs +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: celery task worker daemon +### END INIT INFO +# +# +# To implement separate init scripts, copy this script and give it a different +# name: +# I.e., if my new application, "little-worker" needs an init, I +# should just use: +# +# cp /etc/init.d/celeryd /etc/init.d/little-worker +# +# You can then configure this by manipulating /etc/default/little-worker. +# +VERSION=10.1 +echo "celery init v${VERSION}." +if [ $(id -u) -ne 0 ]; then + echo "Error: This program can only be used by the root user." + echo " Unprivileged users must use the 'celery multi' utility, " + echo " or 'celery worker --detach'." + exit 1 +fi + +export RMQ_CONFIG_FILE="/etc/airtime/airtime.conf" + +# Can be a runlevel symlink (e.g. S02celeryd) +if [ -L "$0" ]; then + SCRIPT_FILE=$(readlink "$0") +else + SCRIPT_FILE="$0" +fi +SCRIPT_NAME="$(basename "$SCRIPT_FILE")" + +DEFAULT_USER="celery" +DEFAULT_PID_FILE="/var/run/celery/%n.pid" +DEFAULT_LOG_FILE="/var/log/celery/%n.log" +DEFAULT_LOG_LEVEL="INFO" +DEFAULT_NODES="celery" +DEFAULT_CELERYD="-m celery worker --detach" + +CELERY_DEFAULTS=${CELERY_DEFAULTS:-"/etc/default/${SCRIPT_NAME}"} +# Make sure executable configuration script is owned by root +_config_sanity() { + local path="$1" + local owner=$(ls -ld "$path" | awk '{print $3}') + local iwgrp=$(ls -ld "$path" | cut -b 6) + local iwoth=$(ls -ld "$path" | cut -b 9) + if [ "$(id -u $owner)" != "0" ]; then + echo "Error: Config script '$path' must be owned by root!" + echo + echo "Resolution:" + echo "Review the file carefully and make sure it has not been " + echo "modified with mailicious intent. When sure the " + echo "script is safe to execute with superuser privileges " + echo "you can change ownership of the script:" + echo " $ sudo chown root '$path'" + exit 1 + fi + if [ "$iwoth" != "-" ]; then # S_IWOTH + echo "Error: Config script '$path' cannot be writable by others!" + echo + echo "Resolution:" + echo "Review the file carefully and make sure it has not been " + echo "modified with malicious intent. When sure the " + echo "script is safe to execute with superuser privileges " + echo "you can change the scripts permissions:" + echo " $ sudo chmod 640 '$path'" + exit 1 + fi + if [ "$iwgrp" != "-" ]; then # S_IWGRP + echo "Error: Config script '$path' cannot be writable by group!" + echo + echo "Resolution:" + echo "Review the file carefully and make sure it has not been " + echo "modified with malicious intent. When sure the " + echo "script is safe to execute with superuser privileges " + echo "you can change the scripts permissions:" + echo " $ sudo chmod 640 '$path'" + exit 1 + fi +} +if [ -f "$CELERY_DEFAULTS" ]; then + _config_sanity "$CELERY_DEFAULTS" + echo "Using config script: $CELERY_DEFAULTS" + . "$CELERY_DEFAULTS" +fi +# Sets --app argument for CELERY_BIN +CELERY_APP_ARG="" +if [ ! -z "$CELERY_APP" ]; then + CELERY_APP_ARG="--app=$CELERY_APP" +fi +CELERYD_USER=${CELERYD_USER:-$DEFAULT_USER} +# Set CELERY_CREATE_DIRS to always create log/pid dirs. +CELERY_CREATE_DIRS=${CELERY_CREATE_DIRS:-0} +CELERY_CREATE_RUNDIR=$CELERY_CREATE_DIRS +CELERY_CREATE_LOGDIR=$CELERY_CREATE_DIRS +if [ -z "$CELERYD_PID_FILE" ]; then + CELERYD_PID_FILE="$DEFAULT_PID_FILE" + CELERY_CREATE_RUNDIR=1 +fi +if [ -z "$CELERYD_LOG_FILE" ]; then + CELERYD_LOG_FILE="$DEFAULT_LOG_FILE" + CELERY_CREATE_LOGDIR=1 +fi +CELERYD_LOG_LEVEL=${CELERYD_LOG_LEVEL:-${CELERYD_LOGLEVEL:-$DEFAULT_LOG_LEVEL}} +CELERY_BIN=${CELERY_BIN:-"celery"} +CELERYD_MULTI=${CELERYD_MULTI:-"$CELERY_BIN multi"} +CELERYD_NODES=${CELERYD_NODES:-$DEFAULT_NODES} +export CELERY_LOADER +if [ -n "$2" ]; then + CELERYD_OPTS="$CELERYD_OPTS $2" +fi +CELERYD_LOG_DIR=`dirname $CELERYD_LOG_FILE` +CELERYD_PID_DIR=`dirname $CELERYD_PID_FILE` +# Extra start-stop-daemon options, like user/group. +if [ -n "$CELERYD_CHDIR" ]; then + DAEMON_OPTS="$DAEMON_OPTS --workdir=$CELERYD_CHDIR" +fi +check_dev_null() { + if [ ! -c /dev/null ]; then + echo "/dev/null is not a character device!" + exit 75 # EX_TEMPFAIL + fi +} +maybe_die() { + if [ $? -ne 0 ]; then + echo "Exiting: $* (errno $?)" + exit 77 # EX_NOPERM + fi +} +create_default_dir() { + if [ ! -d "$1" ]; then + echo "- Creating default directory: '$1'" + mkdir -p "$1" + maybe_die "Couldn't create directory $1" + echo "- Changing permissions of '$1' to 02755" + chmod 02755 "$1" + maybe_die "Couldn't change permissions for $1" + if [ -n "$CELERYD_USER" ]; then + echo "- Changing owner of '$1' to '$CELERYD_USER'" + chown "$CELERYD_USER" "$1" + maybe_die "Couldn't change owner of $1" + fi + if [ -n "$CELERYD_GROUP" ]; then + echo "- Changing group of '$1' to '$CELERYD_GROUP'" + chgrp "$CELERYD_GROUP" "$1" + maybe_die "Couldn't change group of $1" + fi + fi +} +check_paths() { + if [ $CELERY_CREATE_LOGDIR -eq 1 ]; then + create_default_dir "$CELERYD_LOG_DIR" + fi + if [ $CELERY_CREATE_RUNDIR -eq 1 ]; then + create_default_dir "$CELERYD_PID_DIR" + fi +} +create_paths() { + create_default_dir "$CELERYD_LOG_DIR" + create_default_dir "$CELERYD_PID_DIR" +} +export PATH="${PATH:+$PATH:}/usr/sbin:/sbin" +_get_pidfiles () { + # note: multi < 3.1.14 output to stderr, not stdout, hence the redirect. + ${CELERYD_MULTI} expand "${CELERYD_PID_FILE}" ${CELERYD_NODES} 2>&1 +} +_get_pids() { + found_pids=0 + my_exitcode=0 + for pidfile in $(_get_pidfiles); do + local pid=`cat "$pidfile"` + local cleaned_pid=`echo "$pid" | sed -e 's/[^0-9]//g'` + if [ -z "$pid" ] || [ "$cleaned_pid" != "$pid" ]; then + echo "bad pid file ($pidfile)" + one_failed=true + my_exitcode=1 + else + found_pids=1 + echo "$pid" + fi + if [ $found_pids -eq 0 ]; then + echo "${SCRIPT_NAME}: All nodes down" + exit $my_exitcode + fi + done +} +_chuid () { + su "$CELERYD_USER" -c "$CELERYD_MULTI $*" +} +start_workers () { + if [ ! -z "$CELERYD_ULIMIT" ]; then + ulimit $CELERYD_ULIMIT + fi + _chuid $* start $CELERYD_NODES $DAEMON_OPTS \ + --pidfile="$CELERYD_PID_FILE" \ + --logfile="$CELERYD_LOG_FILE" \ + --loglevel="$CELERYD_LOG_LEVEL" \ + $CELERY_APP_ARG \ + $CELERYD_OPTS +} +dryrun () { + (C_FAKEFORK=1 start_workers --verbose) +} +stop_workers () { + _chuid stopwait $CELERYD_NODES --pidfile="$CELERYD_PID_FILE" +} +restart_workers () { + _chuid restart $CELERYD_NODES $DAEMON_OPTS \ + --pidfile="$CELERYD_PID_FILE" \ + --logfile="$CELERYD_LOG_FILE" \ + --loglevel="$CELERYD_LOG_LEVEL" \ + $CELERY_APP_ARG \ + $CELERYD_OPTS +} +kill_workers() { + _chuid kill $CELERYD_NODES --pidfile="$CELERYD_PID_FILE" +} +restart_workers_graceful () { + echo "WARNING: Use with caution in production" + echo "The workers will attempt to restart, but they may not be able to." + local worker_pids= + worker_pids=`_get_pids` + [ "$one_failed" ] && exit 1 + for worker_pid in $worker_pids; do + local failed= + kill -HUP $worker_pid 2> /dev/null || failed=true + if [ "$failed" ]; then + echo "${SCRIPT_NAME} worker (pid $worker_pid) could not be restarted" + one_failed=true + else + echo "${SCRIPT_NAME} worker (pid $worker_pid) received SIGHUP" + fi + done + [ "$one_failed" ] && exit 1 || exit 0 +} +check_status () { + my_exitcode=0 + found_pids=0 + local one_failed= + for pidfile in $(_get_pidfiles); do + if [ ! -r $pidfile ]; then + echo "${SCRIPT_NAME} down: no pidfiles found" + one_failed=true + break + fi + local node=`basename "$pidfile" .pid` + local pid=`cat "$pidfile"` + local cleaned_pid=`echo "$pid" | sed -e 's/[^0-9]//g'` + if [ -z "$pid" ] || [ "$cleaned_pid" != "$pid" ]; then + echo "bad pid file ($pidfile)" + one_failed=true + else + local failed= + kill -0 $pid 2> /dev/null || failed=true + if [ "$failed" ]; then + echo "${SCRIPT_NAME} (node $node) (pid $pid) is down, but pidfile exists!" + one_failed=true + else + echo "${SCRIPT_NAME} (node $node) (pid $pid) is up..." + fi + fi + done + [ "$one_failed" ] && exit 1 || exit 0 +} +case "$1" in + start) + check_dev_null + check_paths + start_workers + ;; + stop) + check_dev_null + check_paths + stop_workers + ;; + reload|force-reload) + echo "Use restart" + ;; + status) + check_status + ;; + restart) + check_dev_null + check_paths + restart_workers + ;; + graceful) + check_dev_null + restart_workers_graceful + ;; + kill) + check_dev_null + kill_workers + ;; + dryrun) + check_dev_null + dryrun + ;; + try-restart) + check_dev_null + check_paths + restart_workers + ;; + create-paths) + check_dev_null + create_paths + ;; + check-paths) + check_dev_null + check_paths + ;; + *) + echo "Usage: /etc/init.d/${SCRIPT_NAME} {start|stop|restart|graceful|kill|dryrun|create-paths}" + exit 64 # EX_USAGE + ;; +esac +exit 0 \ No newline at end of file diff --git a/python_apps/airtime-celery/setup.py b/python_apps/airtime-celery/setup.py new file mode 100644 index 000000000..1f26c373e --- /dev/null +++ b/python_apps/airtime-celery/setup.py @@ -0,0 +1,66 @@ +from setuptools import setup +from subprocess import call +import os +import sys + +# Change directory since setuptools uses relative paths +script_path = os.path.dirname(os.path.realpath(__file__)) +print script_path +os.chdir(script_path) + +install_args = ['install', 'install_data', 'develop'] +no_init = False +run_postinst = False + +# XXX Definitely not the best way of doing this... +if sys.argv[1] in install_args and "--no-init-script" not in sys.argv: + run_postinst = True + data_files = [('/etc/default', ['install/conf/airtime-celery']), + ('/etc/init.d', ['install/initd/airtime-celery'])] +else: + if "--no-init-script" in sys.argv: + no_init = True + run_postinst = True # We still want to run the postinst here + sys.argv.remove("--no-init-script") + data_files = [] + + +def postinst(): + if not no_init: + # Make /etc/init.d file executable and set proper + # permissions for the defaults config file + os.chmod('/etc/init.d/airtime-celery', 0755) + os.chmod('/etc/default/airtime-celery', 0640) + # Make the airtime log directory group-writable + os.chmod('/var/log/airtime', 0775) + + # Create the Celery user + call(['adduser', '--no-create-home', '--home', '/var/lib/celery', '--gecos', '', '--disabled-login', 'celery']) + # Add celery to the www-data group + call(['usermod', '-G', 'www-data', '-a', 'celery']) + + print "Reloading initctl configuration" + call(['initctl', 'reload-configuration']) + print "Setting Celery to start on boot" + call(['update-rc.d', 'airtime-celery', 'defaults']) + print "Run \"sudo service airtime-celery restart\" now." + +setup(name='airtime-celery', + version='0.1', + description='Airtime Celery service', + url='http://github.com/sourcefabric/Airtime', + author='Sourcefabric', + author_email='duncan.sommerville@sourcefabric.org', + license='MIT', + packages=['airtime-celery'], + install_requires=[ + 'soundcloud', + 'celery', + 'kombu', + 'configobj' + ], + zip_safe=False, + data_files=data_files) + +if run_postinst: + postinst() diff --git a/python_apps/airtime_analyzer/setup.py b/python_apps/airtime_analyzer/setup.py index 0e57ac076..47e231123 100644 --- a/python_apps/airtime_analyzer/setup.py +++ b/python_apps/airtime_analyzer/setup.py @@ -1,6 +1,12 @@ from setuptools import setup from subprocess import call import sys +import os + +# Change directory since setuptools uses relative paths +script_path = os.path.dirname(os.path.realpath(__file__)) +print script_path +os.chdir(script_path) # Allows us to avoid installing the upstart init script when deploying airtime_analyzer # on Airtime Pro: diff --git a/python_apps/pypo/pypo/pypofetch.py b/python_apps/pypo/pypo/pypofetch.py index 3772e170c..598d2abbc 100644 --- a/python_apps/pypo/pypo/pypofetch.py +++ b/python_apps/pypo/pypo/pypofetch.py @@ -185,7 +185,7 @@ class PypoFetch(Thread): self.logger.info("Restarting Liquidsoap") - subprocess.call('/etc/init.d/airtime-liquidsoap restart', shell=True, close_fds=True) + subprocess.call('kill -9 `pidof airtime-liquidsoap`', shell=True, close_fds=True) #Wait here and poll Liquidsoap until it has started up self.logger.info("Waiting for Liquidsoap to start") diff --git a/python_apps/pypo/pypo/pypomessagehandler.py b/python_apps/pypo/pypo/pypomessagehandler.py index 8fdb43d9a..043cc6984 100644 --- a/python_apps/pypo/pypo/pypomessagehandler.py +++ b/python_apps/pypo/pypo/pypomessagehandler.py @@ -10,7 +10,7 @@ import time from kombu.connection import BrokerConnection from kombu.messaging import Exchange, Queue from kombu.simple import SimpleQueue -from amqplib.client_0_8.exceptions import AMQPConnectionException +from amqp.exceptions import AMQPError import json from std_err_override import LogWriter @@ -29,21 +29,21 @@ class PypoMessageHandler(Thread): def init_rabbit_mq(self): self.logger.info("Initializing RabbitMQ stuff") + simple_queue = None try: schedule_exchange = Exchange("airtime-pypo", "direct", durable=True, auto_delete=True) schedule_queue = Queue("pypo-fetch", exchange=schedule_exchange, key="foo") - connection = BrokerConnection(self.config["host"], \ - self.config["user"], \ - self.config["password"], \ - self.config["vhost"]) + connection = BrokerConnection(self.config["host"], + self.config["user"], + self.config["password"], + self.config["vhost"]) channel = connection.channel() - self.simple_queue = SimpleQueue(channel, schedule_queue) + simple_queue = SimpleQueue(channel, schedule_queue) except Exception, e: self.logger.error(e) - return False - return True + return simple_queue """ Handle a message from RabbitMQ, put it into our yucky global var. @@ -91,39 +91,18 @@ class PypoMessageHandler(Thread): self.logger.error("Exception in handling RabbitMQ message: %s", e) def main(self): - while not self.init_rabbit_mq(): - self.logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds") - time.sleep(5) - - loops = 1 - while True: - self.logger.info("Loop #%s", loops) - try: - message = self.simple_queue.get(block=True) - self.handle_message(message.payload) - # ACK the message to take it off the queue - message.ack() - except (IOError, AttributeError, AMQPConnectionException), e: - self.logger.error('Exception: %s', e) - self.logger.error("traceback: %s", traceback.format_exc()) - while not self.init_rabbit_mq(): - self.logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds") - time.sleep(5) - except Exception, e: - """ - sleep 5 seconds so that we don't spin inside this - while loop and eat all the CPU - """ - time.sleep(5) - - """ - There is a problem with the RabbitMq messenger service. Let's - log the error and get the schedule via HTTP polling - """ - self.logger.error('Exception: %s', e) - self.logger.error("traceback: %s", traceback.format_exc()) - - loops += 1 + try: + with self.init_rabbit_mq() as queue: + while True: + message = queue.get(block=True) + self.handle_message(message.payload) + # ACK the message to take it off the queue + message.ack() + except Exception, e: + self.logger.error('Exception: %s', e) + self.logger.error("traceback: %s", traceback.format_exc()) + self.logger.error("Error connecting to RabbitMQ Server. Trying again in few seconds") + time.sleep(5) """ Main loop of the thread: diff --git a/python_apps/pypo/setup.py b/python_apps/pypo/setup.py index 3f83fb109..76011e72d 100644 --- a/python_apps/pypo/setup.py +++ b/python_apps/pypo/setup.py @@ -18,8 +18,8 @@ else: pypo_files.append(os.path.join(root, filename)) data_files = [ - # ('/etc/init', ['install/upstart/airtime-playout.conf.template']), - # ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']), + ('/etc/init', ['install/upstart/airtime-playout.conf.template']), + ('/etc/init', ['install/upstart/airtime-liquidsoap.conf.template']), ('/etc/init.d', ['install/sysvinit/airtime-playout']), ('/etc/init.d', ['install/sysvinit/airtime-liquidsoap']), ('/var/log/airtime/pypo', []), diff --git a/uninstall b/uninstall index 1f3c20fc3..b0933aac3 100755 --- a/uninstall +++ b/uninstall @@ -23,6 +23,7 @@ dropAirtimeDatabase() { su postgres <<'EOF' set +e # DROP DATABASE cannot be executed from a function or multi-command string + psql -d postgres -tAc "DROP DATABASE IF EXISTS airtime_test" psql -d postgres -tAc "DROP DATABASE IF EXISTS airtime" psql -d postgres -tAc "DROP USER IF EXISTS airtime" set -e @@ -87,7 +88,10 @@ else fi echo -e "\nUninstalling Airtime..." +service airtime-celery stop +set +e removeRabbitmqAirtimeSettings +set -e for i in ${FILES[*]}; do rm -rf $i diff --git a/utils/soundcloud-uploader b/utils/soundcloud-uploader deleted file mode 100755 index 5eab52b23..000000000 --- a/utils/soundcloud-uploader +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/bash -#------------------------------------------------------------------------------- -# Copyright (c) 2011 Sourcefabric O.P.S. -# -# This file is part of the Airtime project. -# http://airtime.sourcefabric.org/ -# -# Airtime is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# Airtime is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Airtime; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -#------------------------------------------------------------------------------- -#------------------------------------------------------------------------------- -# This script upload files to soundcloud -# -# Absolute path to this script -SCRIPT=`readlink -f $0` -# Absolute directory this script is in -SCRIPTPATH=`dirname $SCRIPT` - -invokePwd=$PWD -cd $SCRIPTPATH - -php -q soundcloud-uploader.php "$@" > /dev/null 2>&1 || exit 1 \ No newline at end of file diff --git a/utils/soundcloud-uploader.php b/utils/soundcloud-uploader.php deleted file mode 100644 index 646c1695d..000000000 --- a/utils/soundcloud-uploader.php +++ /dev/null @@ -1,39 +0,0 @@ -setSoundCloudFileId(SOUNDCLOUD_PROGRESS); -$file->uploadToSoundCloud();