From b0b6e037ac0bdfb5ef8b91f70459e310940503f4 Mon Sep 17 00:00:00 2001 From: Duncan Sommerville Date: Wed, 3 Jun 2015 16:57:17 -0400 Subject: [PATCH] CC-6046, CC-6045, CC-6047 - New SoundCloud implementation --- airtime_mvc/application/Bootstrap.php | 1 + airtime_mvc/application/configs/ACL.php | 4 +- .../application/configs/airtime-conf.php | 2 +- .../configs/classmap-airtime-conf.php | 7 + airtime_mvc/application/configs/conf.php | 12 +- .../application/controllers/ApiController.php | 5 - .../controllers/ErrorController.php | 1 + .../controllers/LibraryController.php | 48 +- .../controllers/PreferenceController.php | 11 +- .../controllers/ScheduleController.php | 19 - .../controllers/SoundcloudController.php | 78 ++ .../controllers/ThirdPartyController.php | 55 + .../controllers/UpgradeController.php | 43 +- .../upgrade_sql/airtime_2.5.13/upgrade.sql | 14 + .../forms/EmailServerPreferences.php | 1 - airtime_mvc/application/forms/Preferences.php | 2 +- .../forms/SoundCloudPreferences.php | 81 ++ .../forms/SoundcloudPreferences.php | 142 --- .../customvalidators/PasswordNotEmpty.php | 18 - airtime_mvc/application/models/Preference.php | 132 +- .../application/models/ShowBuilder.php | 10 - .../application/models/ShowInstance.php | 13 - airtime_mvc/application/models/Soundcloud.php | 99 -- airtime_mvc/application/models/StoredFile.php | 133 +- .../airtime/ThirdPartyTrackReferences.php | 18 + .../airtime/ThirdPartyTrackReferencesPeer.php | 18 + .../ThirdPartyTrackReferencesQuery.php | 18 + .../map/CcPlayoutHistoryTemplateTableMap.php | 1 + .../airtime/map/CcShowInstancesTableMap.php | 2 +- .../models/airtime/map/CcShowTableMap.php | 2 +- .../map/ThirdPartyTrackReferencesTableMap.php | 58 + .../om/BaseCcPlayoutHistoryTemplate.php | 285 +++++ .../om/BaseCcPlayoutHistoryTemplatePeer.php | 3 + .../om/BaseCcPlayoutHistoryTemplateQuery.php | 78 ++ .../om/BaseThirdPartyTrackReferences.php | 1107 +++++++++++++++++ .../om/BaseThirdPartyTrackReferencesPeer.php | 1014 +++++++++++++++ .../om/BaseThirdPartyTrackReferencesQuery.php | 516 ++++++++ .../application/services/CalendarService.php | 17 - .../services/SoundCloudService.php | 164 +++ .../services/ThirdPartyService.php | 120 ++ airtime_mvc/application/upgrade/Upgrades.php | 84 +- .../views/scripts/error/error-404.phtml | 18 + .../views/scripts/form/preferences.phtml | 6 + .../scripts/form/preferences_soundcloud.phtml | 134 +- airtime_mvc/build/build.properties | 2 +- airtime_mvc/build/schema.xml | 10 + airtime_mvc/build/sql/schema.sql | 21 + airtime_mvc/library/soundcloud-api/README.md | 114 -- .../soundcloud-api/Services/Soundcloud.php | 737 ----------- .../Services/Soundcloud/Exception.php | 146 --- .../Services/Soundcloud/Version.php | 22 - .../soundcloud-api/tests/Soundcloud_Test.php | 310 ----- .../tests/Soundcloud_Test_Helper.php | 94 -- .../public/js/airtime/library/library.js | 143 +-- .../js/airtime/preferences/preferences.js | 47 +- .../schedule/full-calendar-functions.js | 46 +- .../public/js/airtime/schedule/schedule.js | 64 +- .../public/js/airtime/showbuilder/builder.js | 2 +- composer.json | 3 +- composer.lock | 50 +- utils/soundcloud-uploader | 34 - utils/soundcloud-uploader.php | 61 - 62 files changed, 4009 insertions(+), 2491 deletions(-) create mode 100644 airtime_mvc/application/controllers/SoundcloudController.php create mode 100644 airtime_mvc/application/controllers/ThirdPartyController.php create mode 100644 airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.13/upgrade.sql create mode 100644 airtime_mvc/application/forms/SoundCloudPreferences.php delete mode 100644 airtime_mvc/application/forms/SoundcloudPreferences.php delete mode 100644 airtime_mvc/application/forms/customvalidators/PasswordNotEmpty.php delete mode 100644 airtime_mvc/application/models/Soundcloud.php create mode 100644 airtime_mvc/application/models/airtime/ThirdPartyTrackReferences.php create mode 100644 airtime_mvc/application/models/airtime/ThirdPartyTrackReferencesPeer.php create mode 100644 airtime_mvc/application/models/airtime/ThirdPartyTrackReferencesQuery.php create mode 100644 airtime_mvc/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php create mode 100644 airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferences.php create mode 100644 airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php create mode 100644 airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php create mode 100644 airtime_mvc/application/services/SoundCloudService.php create mode 100644 airtime_mvc/application/services/ThirdPartyService.php create mode 100644 airtime_mvc/application/views/scripts/error/error-404.phtml delete mode 100644 airtime_mvc/library/soundcloud-api/README.md delete mode 100644 airtime_mvc/library/soundcloud-api/Services/Soundcloud.php delete mode 100644 airtime_mvc/library/soundcloud-api/Services/Soundcloud/Exception.php delete mode 100644 airtime_mvc/library/soundcloud-api/Services/Soundcloud/Version.php delete mode 100644 airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test.php delete mode 100644 airtime_mvc/library/soundcloud-api/tests/Soundcloud_Test_Helper.php delete mode 100755 utils/soundcloud-uploader delete mode 100644 utils/soundcloud-uploader.php diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php index f7af625b3..33ad21d84 100644 --- a/airtime_mvc/application/Bootstrap.php +++ b/airtime_mvc/application/Bootstrap.php @@ -27,6 +27,7 @@ require_once "ProvisioningHelper.php"; require_once "GoogleAnalytics.php"; require_once "Timezone.php"; require_once "Auth.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'; diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php index c58986f1e..cde876b35 100644 --- a/airtime_mvc/application/configs/ACL.php +++ b/airtime_mvc/application/configs/ACL.php @@ -38,7 +38,8 @@ $ccAcl->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('player')) + ->add(new Zend_Acl_Resource('soundcloud')); /** Creating permissions */ $ccAcl->allow('G', 'index') @@ -72,6 +73,7 @@ $ccAcl->allow('G', 'index') ->allow('A', 'systemstatus') ->allow('A', 'preference') ->allow('A', 'player') + ->allow('A', 'soundcloud') ->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..d6f5159e2 100644 --- a/airtime_mvc/application/configs/classmap-airtime-conf.php +++ b/airtime_mvc/application/configs/classmap-airtime-conf.php @@ -103,6 +103,9 @@ return array ( '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', @@ -239,4 +242,8 @@ return array ( '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 f89a5472e..27c1a0071 100644 --- a/airtime_mvc/application/configs/conf.php +++ b/airtime_mvc/application/configs/conf.php @@ -89,7 +89,17 @@ 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']; + if(isset($values['demo']['demo'])){ $CC_CONFIG['demo'] = $values['demo']['demo']; } diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index 490800085..97d7ccb4d 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -717,11 +717,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/ErrorController.php b/airtime_mvc/application/controllers/ErrorController.php index 8a62d9ea6..315da3ac9 100644 --- a/airtime_mvc/application/controllers/ErrorController.php +++ b/airtime_mvc/application/controllers/ErrorController.php @@ -71,6 +71,7 @@ class ErrorController extends Zend_Controller_Action { * 404 error - route or controller */ public function error404Action() { + Logging::info("404!"); $this->_helper->viewRenderer('error-404'); $this->getResponse()->setHttpResponseCode(404); $this->view->message = _('Page not found.'); diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php index 212d57521..07bbc109b 100644 --- a/airtime_mvc/application/controllers/LibraryController.php +++ b/airtime_mvc/application/controllers/LibraryController.php @@ -265,8 +265,9 @@ class LibraryController extends Zend_Controller_Action } } - //SOUNDCLOUD MENU OPTIONS - if ($type === "audioclip" && Application_Model_Preference::GetUploadToSoundcloudOption()) { + // SOUNDCLOUD MENU OPTION + $soundcloudService = new SoundcloudService(); + if ($type === "audioclip" && $soundcloudService->hasAccessToken()) { //create a menu separator $menu["sep1"] = "-----------"; @@ -274,20 +275,16 @@ class LibraryController extends Zend_Controller_Action //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); - } - - if (!is_null($scid)) { + $serviceId = $soundcloudService->getServiceId($id); + if (!is_null($file) && $serviceId != 0) { + $menu["soundcloud"]["items"]["view"] = array("name" => _("View on Soundcloud"), "icon" => "soundcloud", "url" => $baseUrl."soundcloud/view-on-sound-cloud/id/{$id}"); $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}"); + // TODO: reimplement how this works + $menu["soundcloud"]["items"]["upload"] = array("name" => $text, "icon" => "soundcloud", "url" => $baseUrl."soundcloud/upload/id/{$id}"); } if (empty($menu)) { @@ -525,33 +522,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 3a0df1505..401e58af9 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.")."
"; $this->view->form = $form; 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..b265f5740 --- /dev/null +++ b/airtime_mvc/application/controllers/SoundcloudController.php @@ -0,0 +1,78 @@ +_soundcloudService = new SoundcloudService(); + } + + /** + * Send user to SoundCloud to authorize before being redirected + */ + public function authorizeAction() { + $auth_url = $this->_soundcloudService->getAuthorizeUrl(); + header('Location: ' . $auth_url); + } + + /** + * Called when user successfully completes SoundCloud authorization. + * Store the returned request token for future requests. + */ + public function redirectAction() { + $code = $_GET['code']; + $this->_soundcloudService->requestNewAccessToken($code); + header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page + } + + /** + * 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->_soundcloudService->getLinkToFile($id); + header('Location: ' . $soundcloudLink); + } 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->_soundcloudService->removeTrackReference($id); + // Redirect to a 404 so the user knows something went wrong + header('Location: ' . $this->_baseUrl . 'error/error-404'); // Redirect back to the Preference page + } + } + + /** + * Upload the file with the given id to SoundCloud. + * + * @throws Zend_Controller_Response_Exception thrown if upload fails for any reason + */ + public function uploadAction() { + $request = $this->getRequest(); + $id = $request->getParam('id'); + $this->_soundcloudService->upload($id); + } + + /** + * Clear the previously saved request token from the preferences. + */ + public function deauthorizeAction() { + Application_Model_Preference::setSoundCloudRequestToken(""); + header('Location: ' . $this->_baseUrl . 'Preference'); // Redirect back to the Preference page + } + +} diff --git a/airtime_mvc/application/controllers/ThirdPartyController.php b/airtime_mvc/application/controllers/ThirdPartyController.php new file mode 100644 index 000000000..2fec86161 --- /dev/null +++ b/airtime_mvc/application/controllers/ThirdPartyController.php @@ -0,0 +1,55 @@ +_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 + */ + abstract function authorizeAction(); + + /** + * Called when user successfully completes third-party authorization. + * Store the returned request token for future requests. + * + * @return void + */ + abstract function redirectAction(); + + /** + * 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 + */ + abstract function uploadAction(); + + /** + * Clear the previously saved request token from the preferences. + * + * @return void + */ + abstract function deauthorizeAction(); + +} \ No newline at end of file diff --git a/airtime_mvc/application/controllers/UpgradeController.php b/airtime_mvc/application/controllers/UpgradeController.php index 518e173ac..d3cee649b 100644 --- a/airtime_mvc/application/controllers/UpgradeController.php +++ b/airtime_mvc/application/controllers/UpgradeController.php @@ -9,25 +9,21 @@ 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; } - $upgraders = array(); - array_push($upgraders, new AirtimeUpgrader253()); - array_push($upgraders, new AirtimeUpgrader254()); - array_push($upgraders, new AirtimeUpgrader255()); - array_push($upgraders, new AirtimeUpgrader259()); - array_push($upgraders, new AirtimeUpgrader2510()); - array_push($upgraders, new AirtimeUpgrader2511()); - array_push($upgraders, new AirtimeUpgrader2512()); + // Get all upgrades dynamically so we don't have to add them explicitly each time + $upgraders = getUpgrades(); + Logging::info($upgraders); $didWePerformAnUpgrade = false; try { - for ($i = 0; $i < count($upgraders); $i++) + foreach ($upgraders as $upgrader) { - $upgrader = $upgraders[$i]; + /** @var $upgrader AirtimeUpgrader */ + $upgrader = new $upgrader(); if ($upgrader->checkIfUpgradeSupported()) { // pass __DIR__ to the upgrades, since __DIR__ returns parent dir of file, not executor @@ -36,7 +32,6 @@ class UpgradeController extends Zend_Controller_Action $this->getResponse() ->setHttpResponseCode(200) ->appendBody("Upgrade to Airtime " . $upgrader->getNewVersion() . " OK
"); - $i = 0; //Start over, in case the upgrade handlers are not in ascending order. } } @@ -54,28 +49,4 @@ class UpgradeController extends Zend_Controller_Action ->appendBody($e->getMessage()); } } - - 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"); - - $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; - } - return true; - } - } 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..e2d051bff --- /dev/null +++ b/airtime_mvc/application/controllers/upgrade_sql/airtime_2.5.13/upgrade.sql @@ -0,0 +1,14 @@ +CREATE TABLE IF NOT EXISTS "third_party_track_references" +( + "id" serial NOT NULL, + "service" VARCHAR(512) NOT NULL, + "foreign_id" INTEGER NOT NULL, + "file_id" INTEGER NOT NULL, + "status" VARCHAR(256) NOT NULL, + PRIMARY KEY ("id") +); + +ALTER TABLE "third_party_track_references" ADD CONSTRAINT "track_reference_fkey" + FOREIGN KEY ("file_id") + REFERENCES "cc_files" ("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..fbf744520 --- /dev/null +++ b/airtime_mvc/application/forms/SoundCloudPreferences.php @@ -0,0 +1,81 @@ +setDecorators(array( + array('ViewScript', array('viewScript' => 'form/preferences_soundcloud.phtml')) + )); + +// $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::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); @@ -660,12 +589,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(); @@ -711,12 +634,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 { @@ -930,26 +847,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); @@ -1503,4 +1400,33 @@ class Application_Model_Preference { self::setValue("last_tunein_metadata_update", $value); } + + /* Third Party */ + + // SoundCloud + + public static function getDefaultSoundCloudLicenseType() { + return self::getValue("soundcloud_license_type"); + } + + public static function setDefaultSoundCloudLicenseType($value) { + self::setValue("soundcloud_license_type", $value); + } + + public static function getDefaultSoundCloudSharingType() { + return self::getValue("soundcloud_sharing_type"); + } + + 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); + } + } 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 e931b93b9..55d559ce5 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 32d6ec371..8c5eb809f 100644 --- a/airtime_mvc/application/models/StoredFile.php +++ b/airtime_mvc/application/models/StoredFile.php @@ -616,6 +616,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 +905,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); @@ -1131,77 +1134,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(); @@ -1217,12 +1149,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 @@ -1237,51 +1163,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/ThirdPartyTrackReferences.php b/airtime_mvc/application/models/airtime/ThirdPartyTrackReferences.php new file mode 100644 index 000000000..6cd1cc7a4 --- /dev/null +++ b/airtime_mvc/application/models/airtime/ThirdPartyTrackReferences.php @@ -0,0 +1,18 @@ +addRelation('CcPlayoutHistoryTemplateField', 'CcPlayoutHistoryTemplateField', RelationMap::ONE_TO_MANY, array('id' => 'template_id', ), 'CASCADE', null, 'CcPlayoutHistoryTemplateFields'); + $this->addRelation('ThirdPartyTrackReferences', 'ThirdPartyTrackReferences', RelationMap::ONE_TO_MANY, array('id' => 'file_id', ), 'CASCADE', null, 'ThirdPartyTrackReferencess'); } // buildRelations() } // CcPlayoutHistoryTemplateTableMap 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/ThirdPartyTrackReferencesTableMap.php b/airtime_mvc/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php new file mode 100644 index 000000000..bf80e6cd1 --- /dev/null +++ b/airtime_mvc/application/models/airtime/map/ThirdPartyTrackReferencesTableMap.php @@ -0,0 +1,58 @@ +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, 512, null); + $this->addColumn('foreign_id', 'DbForeignId', 'INTEGER', true, null, null); + $this->addForeignKey('file_id', 'DbFileId', 'INTEGER', 'cc_playout_history_template', 'id', true, 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('CcPlayoutHistoryTemplate', 'CcPlayoutHistoryTemplate', RelationMap::MANY_TO_ONE, array('file_id' => 'id', ), 'CASCADE', null); + } // buildRelations() + +} // ThirdPartyTrackReferencesTableMap diff --git a/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php b/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php index 6a2b9230f..a78619c7c 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplate.php @@ -53,6 +53,12 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis protected $collCcPlayoutHistoryTemplateFields; protected $collCcPlayoutHistoryTemplateFieldsPartial; + /** + * @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. @@ -79,6 +85,12 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis */ protected $ccPlayoutHistoryTemplateFieldsScheduledForDeletion = null; + /** + * An array of objects scheduled for deletion. + * @var PropelObjectCollection + */ + protected $thirdPartyTrackReferencessScheduledForDeletion = null; + /** * Get the [id] column value. * @@ -283,6 +295,8 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis $this->collCcPlayoutHistoryTemplateFields = null; + $this->collThirdPartyTrackReferencess = null; + } // if (deep) } @@ -424,6 +438,23 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis } } + 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; } @@ -589,6 +620,14 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis } } + if ($this->collThirdPartyTrackReferencess !== null) { + foreach ($this->collThirdPartyTrackReferencess as $referrerFK) { + if (!$referrerFK->validate($columns)) { + $failureMap = array_merge($failureMap, $referrerFK->getValidationFailures()); + } + } + } + $this->alreadyInValidation = false; } @@ -675,6 +714,9 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis if (null !== $this->collCcPlayoutHistoryTemplateFields) { $result['CcPlayoutHistoryTemplateFields'] = $this->collCcPlayoutHistoryTemplateFields->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); } + if (null !== $this->collThirdPartyTrackReferencess) { + $result['ThirdPartyTrackReferencess'] = $this->collThirdPartyTrackReferencess->toArray(null, true, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects); + } } return $result; @@ -838,6 +880,12 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis } } + 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) @@ -902,6 +950,9 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis if ('CcPlayoutHistoryTemplateField' == $relationName) { $this->initCcPlayoutHistoryTemplateFields(); } + if ('ThirdPartyTrackReferences' == $relationName) { + $this->initThirdPartyTrackReferencess(); + } } /** @@ -1129,6 +1180,231 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis return $this; } + /** + * 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 CcPlayoutHistoryTemplate 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 CcPlayoutHistoryTemplate 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) + ->filterByCcPlayoutHistoryTemplate($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 CcPlayoutHistoryTemplate 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->setCcPlayoutHistoryTemplate(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 + ->filterByCcPlayoutHistoryTemplate($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 CcPlayoutHistoryTemplate 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->setCcPlayoutHistoryTemplate($this); + } + + /** + * @param ThirdPartyTrackReferences $thirdPartyTrackReferences The thirdPartyTrackReferences object to remove. + * @return CcPlayoutHistoryTemplate 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->setCcPlayoutHistoryTemplate(null); + } + + return $this; + } + /** * Clears the current object and sets all attributes to their default values */ @@ -1164,6 +1440,11 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis $o->clearAllReferences($deep); } } + if ($this->collThirdPartyTrackReferencess) { + foreach ($this->collThirdPartyTrackReferencess as $o) { + $o->clearAllReferences($deep); + } + } $this->alreadyInClearAllReferencesDeep = false; } // if ($deep) @@ -1172,6 +1453,10 @@ abstract class BaseCcPlayoutHistoryTemplate extends BaseObject implements Persis $this->collCcPlayoutHistoryTemplateFields->clearIterator(); } $this->collCcPlayoutHistoryTemplateFields = null; + if ($this->collThirdPartyTrackReferencess instanceof PropelCollection) { + $this->collThirdPartyTrackReferencess->clearIterator(); + } + $this->collThirdPartyTrackReferencess = null; } /** diff --git a/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php b/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php index 89c7cdc9d..f30c447fe 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplatePeer.php @@ -368,6 +368,9 @@ abstract class BaseCcPlayoutHistoryTemplatePeer // Invalidate objects in CcPlayoutHistoryTemplateFieldPeer instance pool, // since one or more of them may be deleted by ON DELETE CASCADE/SETNULL rule. CcPlayoutHistoryTemplateFieldPeer::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/BaseCcPlayoutHistoryTemplateQuery.php b/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplateQuery.php index 262b0ee2c..34ed52def 100644 --- a/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplateQuery.php +++ b/airtime_mvc/application/models/airtime/om/BaseCcPlayoutHistoryTemplateQuery.php @@ -22,6 +22,10 @@ * @method CcPlayoutHistoryTemplateQuery rightJoinCcPlayoutHistoryTemplateField($relationAlias = null) Adds a RIGHT JOIN clause to the query using the CcPlayoutHistoryTemplateField relation * @method CcPlayoutHistoryTemplateQuery innerJoinCcPlayoutHistoryTemplateField($relationAlias = null) Adds a INNER JOIN clause to the query using the CcPlayoutHistoryTemplateField relation * + * @method CcPlayoutHistoryTemplateQuery leftJoinThirdPartyTrackReferences($relationAlias = null) Adds a LEFT JOIN clause to the query using the ThirdPartyTrackReferences relation + * @method CcPlayoutHistoryTemplateQuery rightJoinThirdPartyTrackReferences($relationAlias = null) Adds a RIGHT JOIN clause to the query using the ThirdPartyTrackReferences relation + * @method CcPlayoutHistoryTemplateQuery innerJoinThirdPartyTrackReferences($relationAlias = null) Adds a INNER JOIN clause to the query using the ThirdPartyTrackReferences relation + * * @method CcPlayoutHistoryTemplate findOne(PropelPDO $con = null) Return the first CcPlayoutHistoryTemplate matching the query * @method CcPlayoutHistoryTemplate findOneOrCreate(PropelPDO $con = null) Return the first CcPlayoutHistoryTemplate matching the query, or a new CcPlayoutHistoryTemplate object populated from the query conditions when no match is found * @@ -401,6 +405,80 @@ abstract class BaseCcPlayoutHistoryTemplateQuery extends ModelCriteria ->useQuery($relationAlias ? $relationAlias : 'CcPlayoutHistoryTemplateField', 'CcPlayoutHistoryTemplateFieldQuery'); } + /** + * 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 CcPlayoutHistoryTemplateQuery 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(CcPlayoutHistoryTemplatePeer::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 CcPlayoutHistoryTemplateQuery 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/BaseThirdPartyTrackReferences.php b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferences.php new file mode 100644 index 000000000..b94085171 --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferences.php @@ -0,0 +1,1107 @@ +id; + } + + /** + * Get the [service] column value. + * + * @return string + */ + public function getDbService() + { + + return $this->service; + } + + /** + * Get the [foreign_id] column value. + * + * @return int + */ + public function getDbForeignId() + { + + return $this->foreign_id; + } + + /** + * Get the [file_id] column value. + * + * @return int + */ + public function getDbFileId() + { + + return $this->file_id; + } + + /** + * 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 int $v new value + * @return ThirdPartyTrackReferences The current object (for fluent API support) + */ + public function setDbForeignId($v) + { + if ($v !== null && is_numeric($v)) { + $v = (int) $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->aCcPlayoutHistoryTemplate !== null && $this->aCcPlayoutHistoryTemplate->getDbId() !== $v) { + $this->aCcPlayoutHistoryTemplate = null; + } + + + return $this; + } // setDbFileId() + + /** + * 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) ? (int) $row[$startcol + 2] : null; + $this->file_id = ($row[$startcol + 3] !== null) ? (int) $row[$startcol + 3] : null; + $this->status = ($row[$startcol + 4] !== null) ? (string) $row[$startcol + 4] : null; + $this->resetModified(); + + $this->setNew(false); + + if ($rehydrate) { + $this->ensureConsistency(); + } + $this->postHydrate($row, $startcol, $rehydrate); + + return $startcol + 5; // 5 = 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->aCcPlayoutHistoryTemplate !== null && $this->file_id !== $this->aCcPlayoutHistoryTemplate->getDbId()) { + $this->aCcPlayoutHistoryTemplate = 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->aCcPlayoutHistoryTemplate = 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->aCcPlayoutHistoryTemplate !== null) { + if ($this->aCcPlayoutHistoryTemplate->isModified() || $this->aCcPlayoutHistoryTemplate->isNew()) { + $affectedRows += $this->aCcPlayoutHistoryTemplate->save($con); + } + $this->setCcPlayoutHistoryTemplate($this->aCcPlayoutHistoryTemplate); + } + + 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[] = 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::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_INT); + break; + case '"file_id"': + $stmt->bindValue($identifier, $this->file_id, PDO::PARAM_INT); + 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->aCcPlayoutHistoryTemplate !== null) { + if (!$this->aCcPlayoutHistoryTemplate->validate($columns)) { + $failureMap = array_merge($failureMap, $this->aCcPlayoutHistoryTemplate->getValidationFailures()); + } + } + + + if (($retval = ThirdPartyTrackReferencesPeer::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 = 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->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->getDbStatus(), + ); + $virtualColumns = $this->virtualColumns; + foreach ($virtualColumns as $key => $virtualColumn) { + $result[$key] = $virtualColumn; + } + + if ($includeForeignObjects) { + if (null !== $this->aCcPlayoutHistoryTemplate) { + $result['CcPlayoutHistoryTemplate'] = $this->aCcPlayoutHistoryTemplate->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 = 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->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->setDbStatus($arr[$keys[4]]); + } + + /** + * 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::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->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 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 CcPlayoutHistoryTemplate object. + * + * @param CcPlayoutHistoryTemplate $v + * @return ThirdPartyTrackReferences The current object (for fluent API support) + * @throws PropelException + */ + public function setCcPlayoutHistoryTemplate(CcPlayoutHistoryTemplate $v = null) + { + if ($v === null) { + $this->setDbFileId(NULL); + } else { + $this->setDbFileId($v->getDbId()); + } + + $this->aCcPlayoutHistoryTemplate = $v; + + // Add binding for other direction of this n:n relationship. + // If this object has already been added to the CcPlayoutHistoryTemplate object, it will not be re-added. + if ($v !== null) { + $v->addThirdPartyTrackReferences($this); + } + + + return $this; + } + + + /** + * Get the associated CcPlayoutHistoryTemplate object + * + * @param PropelPDO $con Optional Connection object. + * @param $doQuery Executes a query to get the object if required + * @return CcPlayoutHistoryTemplate The associated CcPlayoutHistoryTemplate object. + * @throws PropelException + */ + public function getCcPlayoutHistoryTemplate(PropelPDO $con = null, $doQuery = true) + { + if ($this->aCcPlayoutHistoryTemplate === null && ($this->file_id !== null) && $doQuery) { + $this->aCcPlayoutHistoryTemplate = CcPlayoutHistoryTemplateQuery::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->aCcPlayoutHistoryTemplate->addThirdPartyTrackReferencess($this); + */ + } + + return $this->aCcPlayoutHistoryTemplate; + } + + /** + * 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->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->aCcPlayoutHistoryTemplate instanceof Persistent) { + $this->aCcPlayoutHistoryTemplate->clearAllReferences($deep); + } + + $this->alreadyInClearAllReferencesDeep = false; + } // if ($deep) + + $this->aCcPlayoutHistoryTemplate = 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..20e769677 --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesPeer.php @@ -0,0 +1,1014 @@ + array ('DbId', 'DbService', 'DbForeignId', 'DbFileId', 'DbStatus', ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId', 'dbService', 'dbForeignId', 'dbFileId', 'dbStatus', ), + BasePeer::TYPE_COLNAME => array (ThirdPartyTrackReferencesPeer::ID, ThirdPartyTrackReferencesPeer::SERVICE, ThirdPartyTrackReferencesPeer::FOREIGN_ID, ThirdPartyTrackReferencesPeer::FILE_ID, ThirdPartyTrackReferencesPeer::STATUS, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID', 'SERVICE', 'FOREIGN_ID', 'FILE_ID', 'STATUS', ), + BasePeer::TYPE_FIELDNAME => array ('id', 'service', 'foreign_id', 'file_id', 'status', ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) + ); + + /** + * 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, 'DbStatus' => 4, ), + BasePeer::TYPE_STUDLYPHPNAME => array ('dbId' => 0, 'dbService' => 1, 'dbForeignId' => 2, 'dbFileId' => 3, 'dbStatus' => 4, ), + BasePeer::TYPE_COLNAME => array (ThirdPartyTrackReferencesPeer::ID => 0, ThirdPartyTrackReferencesPeer::SERVICE => 1, ThirdPartyTrackReferencesPeer::FOREIGN_ID => 2, ThirdPartyTrackReferencesPeer::FILE_ID => 3, ThirdPartyTrackReferencesPeer::STATUS => 4, ), + BasePeer::TYPE_RAW_COLNAME => array ('ID' => 0, 'SERVICE' => 1, 'FOREIGN_ID' => 2, 'FILE_ID' => 3, 'STATUS' => 4, ), + BasePeer::TYPE_FIELDNAME => array ('id' => 0, 'service' => 1, 'foreign_id' => 2, 'file_id' => 3, 'status' => 4, ), + BasePeer::TYPE_NUM => array (0, 1, 2, 3, 4, ) + ); + + /** + * 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::STATUS); + } else { + $criteria->addSelectColumn($alias . '.id'); + $criteria->addSelectColumn($alias . '.service'); + $criteria->addSelectColumn($alias . '.foreign_id'); + $criteria->addSelectColumn($alias . '.file_id'); + $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() + { + } + + /** + * 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 CcPlayoutHistoryTemplate 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 doCountJoinCcPlayoutHistoryTemplate(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, CcPlayoutHistoryTemplatePeer::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 CcPlayoutHistoryTemplate 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 doSelectJoinCcPlayoutHistoryTemplate(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; + CcPlayoutHistoryTemplatePeer::addSelectColumns($criteria); + + $criteria->addJoin(ThirdPartyTrackReferencesPeer::FILE_ID, CcPlayoutHistoryTemplatePeer::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 = CcPlayoutHistoryTemplatePeer::getPrimaryKeyHashFromRow($row, $startcol); + if ($key2 !== null) { + $obj2 = CcPlayoutHistoryTemplatePeer::getInstanceFromPool($key2); + if (!$obj2) { + + $cls = CcPlayoutHistoryTemplatePeer::getOMClass(); + + $obj2 = new $cls(); + $obj2->hydrate($row, $startcol); + CcPlayoutHistoryTemplatePeer::addInstanceToPool($obj2, $key2); + } // if obj2 already loaded + + // Add the $obj1 (ThirdPartyTrackReferences) to $obj2 (CcPlayoutHistoryTemplate) + $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, CcPlayoutHistoryTemplatePeer::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; + + CcPlayoutHistoryTemplatePeer::addSelectColumns($criteria); + $startcol3 = $startcol2 + CcPlayoutHistoryTemplatePeer::NUM_HYDRATE_COLUMNS; + + $criteria->addJoin(ThirdPartyTrackReferencesPeer::FILE_ID, CcPlayoutHistoryTemplatePeer::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 CcPlayoutHistoryTemplate rows + + $key2 = CcPlayoutHistoryTemplatePeer::getPrimaryKeyHashFromRow($row, $startcol2); + if ($key2 !== null) { + $obj2 = CcPlayoutHistoryTemplatePeer::getInstanceFromPool($key2); + if (!$obj2) { + + $cls = CcPlayoutHistoryTemplatePeer::getOMClass(); + + $obj2 = new $cls(); + $obj2->hydrate($row, $startcol2); + CcPlayoutHistoryTemplatePeer::addInstanceToPool($obj2, $key2); + } // if obj2 loaded + + // Add the $obj1 (ThirdPartyTrackReferences) to the collection in $obj2 (CcPlayoutHistoryTemplate) + $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..29ac981eb --- /dev/null +++ b/airtime_mvc/application/models/airtime/om/BaseThirdPartyTrackReferencesQuery.php @@ -0,0 +1,516 @@ +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", "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(1234); // WHERE foreign_id = 1234 + * $query->filterByDbForeignId(array(12, 34)); // WHERE foreign_id IN (12, 34) + * $query->filterByDbForeignId(array('min' => 12)); // WHERE foreign_id >= 12 + * $query->filterByDbForeignId(array('max' => 12)); // WHERE foreign_id <= 12 + * + * + * @param mixed $dbForeignId 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 filterByDbForeignId($dbForeignId = null, $comparison = null) + { + if (is_array($dbForeignId)) { + $useMinMax = false; + if (isset($dbForeignId['min'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::FOREIGN_ID, $dbForeignId['min'], Criteria::GREATER_EQUAL); + $useMinMax = true; + } + if (isset($dbForeignId['max'])) { + $this->addUsingAlias(ThirdPartyTrackReferencesPeer::FOREIGN_ID, $dbForeignId['max'], Criteria::LESS_EQUAL); + $useMinMax = true; + } + if ($useMinMax) { + return $this; + } + if (null === $comparison) { + $comparison = Criteria::IN; + } + } + + 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 filterByCcPlayoutHistoryTemplate() + * + * @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 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 CcPlayoutHistoryTemplate object + * + * @param CcPlayoutHistoryTemplate|PropelObjectCollection $ccPlayoutHistoryTemplate 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 filterByCcPlayoutHistoryTemplate($ccPlayoutHistoryTemplate, $comparison = null) + { + if ($ccPlayoutHistoryTemplate instanceof CcPlayoutHistoryTemplate) { + return $this + ->addUsingAlias(ThirdPartyTrackReferencesPeer::FILE_ID, $ccPlayoutHistoryTemplate->getDbId(), $comparison); + } elseif ($ccPlayoutHistoryTemplate instanceof PropelObjectCollection) { + if (null === $comparison) { + $comparison = Criteria::IN; + } + + return $this + ->addUsingAlias(ThirdPartyTrackReferencesPeer::FILE_ID, $ccPlayoutHistoryTemplate->toKeyValue('PrimaryKey', 'DbId'), $comparison); + } else { + throw new PropelException('filterByCcPlayoutHistoryTemplate() only accepts arguments of type CcPlayoutHistoryTemplate or PropelCollection'); + } + } + + /** + * Adds a JOIN clause to the query using the CcPlayoutHistoryTemplate 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 joinCcPlayoutHistoryTemplate($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + $tableMap = $this->getTableMap(); + $relationMap = $tableMap->getRelation('CcPlayoutHistoryTemplate'); + + // 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, 'CcPlayoutHistoryTemplate'); + } + + return $this; + } + + /** + * Use the CcPlayoutHistoryTemplate relation CcPlayoutHistoryTemplate 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 CcPlayoutHistoryTemplateQuery A secondary query class using the current class as primary query + */ + public function useCcPlayoutHistoryTemplateQuery($relationAlias = null, $joinType = Criteria::INNER_JOIN) + { + return $this + ->joinCcPlayoutHistoryTemplate($relationAlias, $joinType) + ->useQuery($relationAlias ? $relationAlias : 'CcPlayoutHistoryTemplate', 'CcPlayoutHistoryTemplateQuery'); + } + + /** + * 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 ed879e90d..098aeaa74 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/SoundCloudService.php b/airtime_mvc/application/services/SoundCloudService.php new file mode 100644 index 000000000..ec36ec5c1 --- /dev/null +++ b/airtime_mvc/application/services/SoundCloudService.php @@ -0,0 +1,164 @@ + "license", + "getDefaultSoundCloudSharingType" => "sharing" + ); + + /** + * Initialize the service + */ + public function __construct() { + $CC_CONFIG = Config::getConfig(); + // FIXME: These values are hardcoded into conf.php right now... + // we should move these to a global config file + $clientId = $CC_CONFIG['soundcloud-client-id']; + $clientSecret = $CC_CONFIG['soundcloud-client-secret']; + $baseUrl = $CC_CONFIG['baseUrl'] . ":" . $CC_CONFIG['basePort']; + $redirectUri = 'http://' . $baseUrl . '/soundcloud/redirect'; + + $this->_client = new Soundcloud\Service($clientId, $clientSecret, $redirectUri); + $accessToken = Application_Model_Preference::getSoundCloudRequestToken(); + if (!empty($accessToken)) { + $this->_client->setAccessToken($accessToken); + } + } + + // TODO: upload functionality will be moved to python, this is just for testing + /** + * Upload the file with the given identifier to SoundCloud + * + * @param int $fileId the local CcFiles identifier + * + * @throws Soundcloud\Exception\InvalidHttpResponseCodeException + * thrown when the upload fails for any reason + */ + public function upload($fileId) { + $file = Application_Model_StoredFile::RecallById($fileId); + try { + $track = json_decode($this->_client->post('tracks', $this->_buildTrackArray($file))); + parent::_createTrackReference($fileId, $track); + } catch(Soundcloud\Exception\InvalidHttpResponseCodeException $e) { + Logging::info("Invalid request: " . $e->getMessage()); + // We should only get here if we have an access token, so attempt to refresh + $this->accessTokenRefresh(); + } + } + + /** + * 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 + */ + private function _buildTrackArray($file) { + $trackArray = array( + 'track[title]' => $file->getName(), + // TODO: verify that S3 uploads work + 'track[asset_data]' => '@'.$file->getFilePaths()[0] + ); + + foreach($this->_SOUNDCLOUD_PREF_FUNCTIONS as $func => $param) { + $val = Application_Model_Preference::$func(); + if (!empty($val)) { + $trackArray["track[$param]"] = $val; + } + } + + return $trackArray; + } + + /** + * 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 + */ + 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 ''; } + $track = json_decode($this->_client->get('tracks/'. $serviceId)); + 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() { + $accessToken = $this->_client->getAccessToken(); + return !empty($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'].$_SERVER['REQUEST_URI']); + return $this->_client->getAuthorizeUrl(array("state" => $url)); + } + + /** + * 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, $postData = array('scope' => 'non-expiring')); + $accessToken = $response['access_token']; + Application_Model_Preference::setSoundCloudRequestToken($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->_client->getAccessToken(); + $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/ThirdPartyService.php b/airtime_mvc/application/services/ThirdPartyService.php new file mode 100644 index 000000000..48e882a44 --- /dev/null +++ b/airtime_mvc/application/services/ThirdPartyService.php @@ -0,0 +1,120 @@ +filterByDbService($this->_SERVICE_NAME) + ->findOneByDbFileId($fileId); + if (is_null($ref)) { + $ref = new ThirdPartyTrackReferences(); + } + $ref->setDbService($this->_SERVICE_NAME); + $ref->setDbForeignId($track->id); + $ref->setDbFileId($fileId); + $ref->setDbStatus($track->state); + $ref->save(); + } + + /** + * 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 local CcFiles identifier + * + * @throws Exception + * @throws PropelException + */ + public function removeTrackReference($fileId) { + $ref = ThirdPartyTrackReferencesQuery::create() + ->filterByDbService($this->_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 local CcFiles identifier + * + * @return int the service foreign identifier + */ + public function getServiceId($fileId) { + $ref = ThirdPartyTrackReferencesQuery::create() + ->filterByDbService($this->_SERVICE_NAME) + ->findOneByDbFileId($fileId); // There shouldn't be duplicates! + return is_null($ref) ? 0 : $ref->getDbForeignId(); + } + + /** + * 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 local CcFiles identifier + * + * @return string the link to the remote file + */ + public function getLinkToFile($fileId) { + $serviceId = $this->getServiceId($fileId); + return $serviceId > 0 ? $this->_THIRD_PARTY_TRACK_URI . $serviceId : ''; + } + + /** + * Check whether an OAuth access token exists for the third-party client + * + * @return bool true if an access token exists, otherwise false + */ + abstract function hasAccessToken(); + + /** + * Get the OAuth authorization URL + * + * @return string the authorization URL + */ + abstract function getAuthorizeUrl(); + + /** + * Request a new OAuth access token from a third-party service and store it in CcPref + * + * @param $code string exchange authorization code for access token + */ + abstract function requestNewAccessToken($code); + + /** + * Regenerate the third-party client's OAuth access token + */ + abstract function accessTokenRefresh(); + +} \ No newline at end of file diff --git a/airtime_mvc/application/upgrade/Upgrades.php b/airtime_mvc/application/upgrade/Upgrades.php index 9468753d6..adb54002c 100644 --- a/airtime_mvc/application/upgrade/Upgrades.php +++ b/airtime_mvc/application/upgrade/Upgrades.php @@ -1,5 +1,25 @@ filterByKeystr('system_version') - ->findOne(); + ->filterByKeystr('system_version') + ->findOne(); $airtime_version = $pref->getValStr(); return $airtime_version; } - - /** + + /** * 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::getCurrentVersion(), $this->getSupportedVersions())) { return false; } return true; } - + protected function toggleMaintenanceScreen($toggle) { if ($toggle) @@ -51,7 +71,7 @@ abstract class AirtimeUpgrader }*/ } } - + /** Implement this for each new version of Airtime */ abstract public function upgrade(); } @@ -437,3 +457,49 @@ class AirtimeUpgrader2512 extends AirtimeUpgrader } } + +class AirtimeUpgrader2513 extends AirtimeUpgrader +{ + protected function getSupportedVersions() { + return array ( + '2.5.12' + ); + } + + public function getNewVersion() { + return '2.5.13'; + } + + 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_" + .$newVersion."/upgrade.sql $database 2>&1 | grep -v -E \"will create implicit sequence|will create implicit index\""); + + Application_Model_Preference::SetAirtimeVersion($newVersion); + Cache::clear(); + + $this->toggleMaintenanceScreen(false); + } catch(Exception $e) { + $this->toggleMaintenanceScreen(false); + throw $e; + } + } +} + 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 d200bf627..681cdfdd5 100644 --- a/airtime_mvc/application/views/scripts/form/preferences.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences.phtml @@ -11,6 +11,12 @@ +

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

element->getSubform('preferences_danger') ?> diff --git a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml index 4ee3ff7f0..594468474 100644 --- a/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml +++ b/airtime_mvc/application/views/scripts/form/preferences_soundcloud.phtml @@ -1,112 +1,30 @@
-
- - 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): ?> -
    • - -
- -
+ +element->getElement('SoundCloudTrackType')->getLabel() ?> + + +element->getElement('SoundCloudTrackType') ?> +element->getElement('SoundCloudTrackType')->hasErrors()) : ?> + +element->getElement('SoundCloudTrackType')->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/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..03bad21cb 100644 --- a/airtime_mvc/build/schema.xml +++ b/airtime_mvc/build/schema.xml @@ -531,4 +531,14 @@ + + + + + + + + + +
diff --git a/airtime_mvc/build/sql/schema.sql b/airtime_mvc/build/sql/schema.sql index 392539496..3d7aaf39a 100644 --- a/airtime_mvc/build/sql/schema.sql +++ b/airtime_mvc/build/sql/schema.sql @@ -670,6 +670,22 @@ 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(512) NOT NULL, + "foreign_id" INTEGER NOT NULL, + "file_id" INTEGER NOT NULL, + "status" VARCHAR(256) NOT NULL, + PRIMARY KEY ("id") +); + ALTER TABLE "cc_files" ADD CONSTRAINT "cc_files_owner_fkey" FOREIGN KEY ("owner_id") REFERENCES "cc_subjs" ("id"); @@ -831,3 +847,8 @@ 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_playout_history_template" ("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/js/airtime/library/library.js b/airtime_mvc/public/js/airtime/library/library.js index dae2d916e..445e36b5a 100644 --- a/airtime_mvc/public/js/airtime/library/library.js +++ b/airtime_mvc/public/js/airtime/library/library.js @@ -612,17 +612,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(""); @@ -892,10 +881,6 @@ var AIRTIME = (function(AIRTIME) { } }); - checkLibrarySCUploadStatus(); - - addQtipToSCIcons(); - // begin context menu initialization. $.contextMenu({ selector: '#library_display td:not(.library_checkbox)', @@ -1026,21 +1011,19 @@ 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); - }); + $.post(soundcloud.upload.url, function(){}); }; soundcloud.upload.callback = callback; } - + // define a view on soundcloud callback if (soundcloud.view !== undefined) { - + callback = function() { window.open(soundcloud.view.url); }; @@ -1140,122 +1123,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 252a64a99..ad4bfd5fb 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 */ @@ -118,21 +132,21 @@ function setCollapsibleWidgetJsCode() { $('#thirdPartyApi-element input').click(x); } -function setSoundCloudCheckBoxListener() { - var subCheckBox= $("#UseSoundCloud,#SoundCloudDownloadbleOption"); - var mainCheckBox= $("#UploadToSoundcloudOption"); - subCheckBox.change(function(e){ - if (subCheckBox.is(':checked')) { - mainCheckBox.attr("checked", true); - } - }); - - mainCheckBox.change(function(e){ - if (!mainCheckBox.is(':checked')) { - $("#UseSoundCloud,#SoundCloudDownloadbleOption").attr("checked", false); - } - }); -} +//function setSoundCloudCheckBoxListener() { +// var subCheckBox= $("#UseSoundCloud,#SoundCloudDownloadbleOption"); +// var mainCheckBox= $("#UploadToSoundcloudOption"); +// subCheckBox.change(function(e){ +// if (subCheckBox.is(':checked')) { +// mainCheckBox.attr("checked", true); +// } +// }); +// +// mainCheckBox.change(function(e){ +// if (!mainCheckBox.is(':checked')) { +// $("#UseSoundCloud,#SoundCloudDownloadbleOption").attr("checked", false); +// } +// }); +//} function removeLogo() { $.post(baseUrl+'Preference/remove-logo', function(json){}); @@ -176,7 +190,7 @@ $(document).ready(function() { showErrorSections(); - setSoundCloudCheckBoxListener(); + //setSoundCloudCheckBoxListener(); setMailServerInputReadonly(); setSystemFromEmailReadonly(); setConfigureMailServerListener(); @@ -184,4 +198,5 @@ $(document).ready(function() { setCollapsibleWidgetJsCode(); 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..d27478d4d 100644 --- a/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js +++ b/airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js @@ -196,29 +196,29 @@ function eventRender(event, element, view) { } //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 === 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..6bbefe0fa 100644 --- a/airtime_mvc/public/js/airtime/schedule/schedule.js +++ b/airtime_mvc/public/js/airtime/schedule/schedule.js @@ -63,24 +63,24 @@ 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 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', @@ -422,22 +422,22 @@ $(document).ready(function() { } //define a soundcloud upload callback. - if (oItems.soundcloud_upload !== undefined) { - - callback = function() { - uploadToSoundCloud(data.id, this.context); - }; - oItems.soundcloud_upload.callback = 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; - } + //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 8a57b4bd2..42e76f5e6 100644 --- a/airtime_mvc/public/js/airtime/showbuilder/builder.js +++ b/airtime_mvc/public/js/airtime/showbuilder/builder.js @@ -533,7 +533,7 @@ var AIRTIME = (function(AIRTIME){ if (aData.record === true) { - headerIcon = (aData.soundcloud_id > 0) ? "soundcloud" : "recording"; + //headerIcon = (aData.soundcloud_id > 0) ? "soundcloud" : "recording"; $div = $("
", { "class": "small-icon " + headerIcon diff --git a/composer.json b/composer.json index 6d92538de..03adc292a 100644 --- a/composer.json +++ b/composer.json @@ -2,6 +2,7 @@ "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" } } diff --git a/composer.lock b/composer.lock index 17d9b1085..c819c7f39 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": "e731a5b93a15b54d4c22e26f33dc1aaa", "packages": [ { "name": "aws/aws-sdk-php", @@ -165,6 +165,54 @@ ], "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": "phing/phing", "version": "2.9.1", 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 0e1245945..000000000 --- a/utils/soundcloud-uploader.php +++ /dev/null @@ -1,61 +0,0 @@ -setSoundCloudFileId(SOUNDCLOUD_PROGRESS); -$file->uploadToSoundCloud(); -