From a4fb63afcfd99593b783716fbb1a0a88d8db02c9 Mon Sep 17 00:00:00 2001 From: James Date: Wed, 21 Sep 2011 10:16:48 -0400 Subject: [PATCH 1/6] CC-2856: duration was is always fixed to 1h - fixed --- airtime_mvc/public/js/airtime/schedule/add-show.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/airtime_mvc/public/js/airtime/schedule/add-show.js b/airtime_mvc/public/js/airtime/schedule/add-show.js index c9f676148..eaa7d44fa 100644 --- a/airtime_mvc/public/js/airtime/schedule/add-show.js +++ b/airtime_mvc/public/js/airtime/schedule/add-show.js @@ -374,16 +374,16 @@ function setAddShowEvents() { function calculateDuration(endDateTime, startDateTime){ var duration; var durationSeconds = (endDateTime.getTime() - startDateTime.getTime())/1000; - if(durationSeconds != 0){ + if(isNaN(durationSeconds)){ + duration = '1h'; + } + else if(durationSeconds != 0){ var durationHour = parseInt(durationSeconds/3600, 10); var durationMin = parseInt((durationSeconds%3600)/60, 10); duration = (durationHour == 0 ? '' : durationHour+'h'+' ')+(durationMin == 0 ? '' : durationMin+'m'); }else{ duration = '0m'; } - if(isNaN(duration)){ - duration = '1h'; - } $('#add_show_duration').val(duration); } From a88bb908513840f72118d5818e0b425810c3c835 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 22 Sep 2011 15:53:21 -0400 Subject: [PATCH 2/6] CC-2591: Allow upload of any audio clip to Soundcloud - removing debug code --- utils/soundcloud-uploader.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/utils/soundcloud-uploader.php b/utils/soundcloud-uploader.php index d5036ad64..df1577d4b 100644 --- a/utils/soundcloud-uploader.php +++ b/utils/soundcloud-uploader.php @@ -22,8 +22,7 @@ $CC_CONFIG['soundcloud-connection-wait'] = $values['soundcloud']['time_between_r require_once($CC_CONFIG['phpDir'].'/application/configs/constants.php'); require_once($CC_CONFIG['phpDir'].'/application/configs/conf.php'); -//$CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; -$CC_CONFIG['phpDir'] = "/home/james/src/airtime/airtime_mvc"; +$CC_CONFIG['phpDir'] = $values['general']['airtime_dir']; require_once($CC_CONFIG['phpDir'].'/application/models/StoredFile.php'); require_once($CC_CONFIG['phpDir'].'/application/models/Preference.php'); From 86b365cc7ea1a6ce1b3f38a5bf58698f92e9a645 Mon Sep 17 00:00:00 2001 From: martin Date: Thu, 22 Sep 2011 16:10:22 -0400 Subject: [PATCH 3/6] get rid of liquidsoap binary showing as modified --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 3f52a5722..5a4e08e87 100644 --- a/.gitignore +++ b/.gitignore @@ -2,4 +2,5 @@ *.pyc /files python_apps/pypo/liquidsoap_bin/liquidsoap +python_apps/pypo/liquidsoap/ build/build.properties From a7b7e09aa449b7a4a90c4e2008adbc6f7c7a283d Mon Sep 17 00:00:00 2001 From: James Date: Thu, 22 Sep 2011 16:56:20 -0400 Subject: [PATCH 4/6] CC-2867: upgrade script for soundcolud plugin - done - extra fix: upgrade for recaptcha stuff - fix a bug on UTC upgrade --- .../Version20110829143306.php | 13 +++++++ .../Version20110922153933.php | 38 +++++++++++++++++++ .../airtime-2.0.0/airtime-upgrade.php | 4 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 install_minimal/DoctrineMigrations/Version20110922153933.php diff --git a/install_minimal/DoctrineMigrations/Version20110829143306.php b/install_minimal/DoctrineMigrations/Version20110829143306.php index 477df6a39..798312201 100644 --- a/install_minimal/DoctrineMigrations/Version20110829143306.php +++ b/install_minimal/DoctrineMigrations/Version20110829143306.php @@ -18,6 +18,19 @@ class Version20110829143306 extends AbstractMigration $cc_stream_setting->setPrimaryKey(array('keyname')); //end create cc_stream_setting table + + // add soundcloud_id, soundcloud_error_code, soundcloud_error_msg columns to cc_files + $cc_files = $schema->getTable('cc_files'); + $cc_files->addColumn('soundcloud_id', 'integer', array('notnull' => 0, 'default'=> NULL)); + $cc_files->addColumn('soundcloud_error_code', 'integer', array('notnull' => 0, 'default'=> NULL)); + $cc_files->addColumn('soundcloud_error_msg', 'string', array('length' => 255, 'notnull' => 0, 'default'=> NULL)); + } + + public function postUp(){ + // move soundcloud_id from cc_show_instances to cc_files + $this->_addSql("update cc_files as cf set soundcloud_id = csi.soundcloud_id + from cc_show_instances as csi + where csi.file_id = cf.id and file_id is not NULL"); } public function down(Schema $schema) diff --git a/install_minimal/DoctrineMigrations/Version20110922153933.php b/install_minimal/DoctrineMigrations/Version20110922153933.php new file mode 100644 index 000000000..591f67a22 --- /dev/null +++ b/install_minimal/DoctrineMigrations/Version20110922153933.php @@ -0,0 +1,38 @@ +_addSql("update cc_files as cf set soundcloud_id = csi.soundcloud_id + from cc_show_instances as csi + where csi.file_id = cf.id and file_id is not NULL"); + + // remove soundcloud_id from cc_show_instance table + $cc_show_instances = $schema->getTable('cc_show_instances'); + $cc_show_instances->dropColumn('soundcloud_id'); + + // create cc_login_sttempts table + $cc_login = $schema->createTable('cc_login_attempts'); + + $cc_login->addColumn('ip', 'string', array('length' => 32)); + $cc_login->addColumn('attempts', 'integer', array('notnull' => 0, 'default'=> 0)); + + $cc_login->setPrimaryKey(array('ip')); + + // add login_attempts column to cc_subjs table + $cc_subjs = $schema->getTable('cc_subjs'); + $cc_subjs->addColumn('login_attempts', 'integer', array('notnull' => 0, 'default'=> 0)); + } + + public function down(Schema $schema) + { + + } +} \ No newline at end of file diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php index 5b6eb6006..83eb96d1c 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -301,7 +301,7 @@ class ConvertToUtc{ $dt = new DateTime($sd->getDbFirstShow()." ".$sd->getDbStartTime(), new DateTimeZone(date_default_timezone_get())); $dt->setTimezone(new DateTimeZone("UTC")); $sd->setDbFirstShow($dt->format("Y-m-d")); - $sd->setDbStartTime($dt->format("H-i-s")); + $sd->setDbStartTime($dt->format("H:i:s")); $dt = new DateTime($sd->getDbLastShow()." ".$sd->getDbStartTime(), new DateTimeZone(date_default_timezone_get())); $dt->setTimezone(new DateTimeZone("UTC")); @@ -571,7 +571,7 @@ if(AirtimeInstall::DbTableExists('doctrine_migration_versions') === false) { } } -AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110829143306'); +AirtimeInstall::MigrateTablesToVersion(__DIR__, '20110922153933'); AirtimeInstall::SetDefaultStreamSetting(); From e722ff8c36a083ef5fe3a2c07d6ee519254ecaf3 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 22 Sep 2011 16:59:13 -0400 Subject: [PATCH 5/6] CC-2873: soundcloud error log to DB - fixed --- airtime_mvc/application/controllers/ApiController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php index afeea3649..f287d2eae 100644 --- a/airtime_mvc/application/controllers/ApiController.php +++ b/airtime_mvc/application/controllers/ApiController.php @@ -407,6 +407,13 @@ class ApiController extends Zend_Controller_Action } catch (Services_Soundcloud_Invalid_Http_Response_Code_Exception $e) { $code = $e->getHttpCode(); + $msg = $e->getHttpBody(); + $temp = explode('"error":',$msg); + $msg = trim($temp[1], '"}'); + $this->setSoundCloudErrorCode($code); + $this->setSoundCloudErrorMsg($msg); + // setting sc id to -3 which indicates error + $this->setSoundCloudFileId(-3); if(!in_array($code, array(0, 100))) { break; } From ac13bba2dbc5b67658fd3e1b69b55ff1ad2e91f0 Mon Sep 17 00:00:00 2001 From: James Date: Thu, 22 Sep 2011 17:06:33 -0400 Subject: [PATCH 6/6] CC-2874: adding error icon - done --- .../public/css/images/icon_soundcloud_error2.png | Bin 0 -> 484 bytes airtime_mvc/public/css/styles.css | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 airtime_mvc/public/css/images/icon_soundcloud_error2.png diff --git a/airtime_mvc/public/css/images/icon_soundcloud_error2.png b/airtime_mvc/public/css/images/icon_soundcloud_error2.png new file mode 100644 index 0000000000000000000000000000000000000000..5f6145c0bc056f88b80e3a1a550a2cdc6d0b99b3 GIT binary patch literal 484 zcmVPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipl2 z6axu`k<7IK00Cr4L_t(2&#jWNYui8=#ee6>I3!DyExEXx$fv4SAb9_Tx0u{`(gfbT(?&8EUI)ObABWHM1v6q+Bt(d_** zBOBXwA=0ST3=ZIypP_t;CzlO znE5KQz!?||*b5hWdg{dIRcNQvp&T8+tc2e=Eb165nAb5D^v44Wtkqm-yY0kZRp?+a zz}tKYtYT6@QHRt((Euw<-T({bhUY@%uH-|tQoipiiXtURqJL_8`*!;k4