Congegni
/
libretime
mirror of https://github.com/libretime/libretime.git
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.8.2' into devel 

Conflicts:
	airtime_mvc/application/models/Dashboard.php
	python_apps/media-monitor/airtime-media-monitor-start
	python_apps/pypo/airtime-pypo-start
	python_apps/show-recorder/airtime-show-recorder-start
This commit is contained in:
martin 2011-06-03 17:29:55 -04:00
parent f5b55ce52b eee885f746
commit 1540e593e4
12 changed files with 287 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changelog
View File

@ -17,6 +17,9 @@ Highlights:
- When canceling a playing show, the currently playing audio file still showed as playing. This has been fixed. - When canceling a playing show, the currently playing audio file still showed as playing. This has been fixed.
- Audio files greater than 100MB were not being played. - Audio files greater than 100MB were not being played.
- Fixed uploading audio on Chrome 11 and higher - Fixed uploading audio on Chrome 11 and higher
- Fixed various editing show problems
- Fixed airtime-pypo-stop/start causing playback problems
- Fixed incorrect information being occasionally shown in the top panel
1.8.1 - May 2, 2011 1.8.1 - May 2, 2011

2
VERSION
View File

@ -1,2 +1,2 @@
PRODUCT_ID=Airtime PRODUCT_ID=Airtime
PRODUCT_RELEASE=1.9.0-devel PRODUCT_RELEASE=1.8.2

128
airtime_mvc/application/controllers/ScheduleController.php
View File

@ -53,34 +53,8 @@ class ScheduleController extends Zend_Controller_Action
$this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/colorpicker/css/colorpicker.css');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/add-show.css');
$this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css'); $this->view->headLink()->appendStylesheet($baseUrl.'/css/contextmenu.css');
$formWhat = new Application_Form_AddShowWhat(); Schedule::createNewFormSections($this->view);
$formWho = new Application_Form_AddShowWho();
$formWhen = new Application_Form_AddShowWhen();
$formRepeats = new Application_Form_AddShowRepeats();
$formStyle = new Application_Form_AddShowStyle();
$formRecord = new Application_Form_AddShowRR();
$formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates();
$formRebroadcast = new Application_Form_AddShowRebroadcastDates();
$formWhat->removeDecorator('DtDdWrapper');
$formWho->removeDecorator('DtDdWrapper');
$formWhen->removeDecorator('DtDdWrapper');
$formRepeats->removeDecorator('DtDdWrapper');
$formStyle->removeDecorator('DtDdWrapper');
$formRecord->removeDecorator('DtDdWrapper');
$this->view->what = $formWhat;
$this->view->when = $formWhen;
$this->view->repeats = $formRepeats;
$this->view->who = $formWho;
$this->view->style = $formStyle;
$this->view->rr = $formRecord;
$this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
$this->view->rebroadcast = $formRebroadcast;
$this->view->addNewShow = true;
$formWhat->populate(array('add_show_id' => '-1'));
$userInfo = Zend_Auth::getInstance()->getStorage()->read(); $userInfo = Zend_Auth::getInstance()->getStorage()->read();
$user = new User($userInfo->id); $user = new User($userInfo->id);
@ -446,10 +420,14 @@ class ScheduleController extends Zend_Controller_Action
'add_show_description' => $show->getDescription())); 'add_show_description' => $show->getDescription()));
$formWhen->populate(array('add_show_start_date' => $show->getStartDate(), $formWhen->populate(array('add_show_start_date' => $show->getStartDate(),
'add_show_start_time' => Show::removeSecondsFromTime($show->getStartTime()), 'add_show_start_time' => DateHelper::removeSecondsFromTime($show->getStartTime()),
'add_show_duration' => $show->getDuration(), 'add_show_duration' => $show->getDuration(),
'add_show_repeats' => $show->isRepeating() ? 1 : 0)); 'add_show_repeats' => $show->isRepeating() ? 1 : 0));
if ($show->isStartDateTimeInPast()){
$formWhen->getElement('add_show_start_date')->setOptions(array('disabled' => true));
}
$days = array(); $days = array();
$showDays = CcShowDaysQuery::create()->filterByDbShowId($showInstance->getShowId())->find(); $showDays = CcShowDaysQuery::create()->filterByDbShowId($showInstance->getShowId())->find();
foreach($showDays as $showDay){ foreach($showDays as $showDay){
@ -476,7 +454,7 @@ class ScheduleController extends Zend_Controller_Action
$i = 1; $i = 1;
foreach ($rebroadcastsRelative as $rebroadcast){ foreach ($rebroadcastsRelative as $rebroadcast){
$rebroadcastFormValues["add_show_rebroadcast_date_$i"] = $rebroadcast['day_offset']; $rebroadcastFormValues["add_show_rebroadcast_date_$i"] = $rebroadcast['day_offset'];
$rebroadcastFormValues["add_show_rebroadcast_time_$i"] = Show::removeSecondsFromTime($rebroadcast['start_time']); $rebroadcastFormValues["add_show_rebroadcast_time_$i"] = DateHelper::removeSecondsFromTime($rebroadcast['start_time']);
$i++; $i++;
} }
$formRebroadcast->populate($rebroadcastFormValues); $formRebroadcast->populate($rebroadcastFormValues);
@ -486,7 +464,7 @@ class ScheduleController extends Zend_Controller_Action
$i = 1; $i = 1;
foreach ($rebroadcastsAbsolute as $rebroadcast){ foreach ($rebroadcastsAbsolute as $rebroadcast){
$rebroadcastAbsoluteFormValues["add_show_rebroadcast_date_absolute_$i"] = $rebroadcast['start_date']; $rebroadcastAbsoluteFormValues["add_show_rebroadcast_date_absolute_$i"] = $rebroadcast['start_date'];
$rebroadcastAbsoluteFormValues["add_show_rebroadcast_time_absolute_$i"] = Show::removeSecondsFromTime($rebroadcast['start_time']); $rebroadcastAbsoluteFormValues["add_show_rebroadcast_time_absolute_$i"] = DateHelper::removeSecondsFromTime($rebroadcast['start_time']);
$i++; $i++;
} }
$formAbsoluteRebroadcast->populate($rebroadcastAbsoluteFormValues); $formAbsoluteRebroadcast->populate($rebroadcastAbsoluteFormValues);
@ -506,35 +484,8 @@ class ScheduleController extends Zend_Controller_Action
$this->view->entries = 5; $this->view->entries = 5;
} }
public function getFormAction(){ public function getFormAction(){
$formWhat = new Application_Form_AddShowWhat(); Schedule::createNewFormSections($this->view);
$formWho = new Application_Form_AddShowWho();
$formWhen = new Application_Form_AddShowWhen();
$formRepeats = new Application_Form_AddShowRepeats();
$formStyle = new Application_Form_AddShowStyle();
$formRecord = new Application_Form_AddShowRR();
$formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates();
$formRebroadcast = new Application_Form_AddShowRebroadcastDates();
$formWhat->removeDecorator('DtDdWrapper');
$formWho->removeDecorator('DtDdWrapper');
$formWhen->removeDecorator('DtDdWrapper');
$formRepeats->removeDecorator('DtDdWrapper');
$formStyle->removeDecorator('DtDdWrapper');
$formRecord->removeDecorator('DtDdWrapper');
$this->view->what = $formWhat;
$this->view->when = $formWhen;
$this->view->repeats = $formRepeats;
$this->view->who = $formWho;
$this->view->style = $formStyle;
$this->view->rr = $formRecord;
$this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
$this->view->rebroadcast = $formRebroadcast;
$this->view->addNewShow = true;
$formWhat->populate(array('add_show_id' => '-1'));
$this->view->form = $this->view->render('schedule/add-show-form.phtml'); $this->view->form = $this->view->render('schedule/add-show-form.phtml');
} }
@ -548,6 +499,16 @@ class ScheduleController extends Zend_Controller_Action
$data[$j["name"]] = $j["value"]; $data[$j["name"]] = $j["value"];
} }
$show = new Show($data['add_show_id']);
$startDateModified = true;
if ($data['add_show_id'] != -1 && !array_key_exists('add_show_start_date', $data)){
//show is being updated and changing the start date was disabled, since the
//array key does not exist. We need to repopulate this entry from the db.
$data['add_show_start_date'] = $show->getStartDate();
$startDateModified = false;
}
$data['add_show_hosts'] = $this->_getParam('hosts'); $data['add_show_hosts'] = $this->_getParam('hosts');
$data['add_show_day_check'] = $this->_getParam('days'); $data['add_show_day_check'] = $this->_getParam('days');
@ -573,24 +534,13 @@ class ScheduleController extends Zend_Controller_Action
$formAbsoluteRebroadcast->removeDecorator('DtDdWrapper'); $formAbsoluteRebroadcast->removeDecorator('DtDdWrapper');
$formRebroadcast->removeDecorator('DtDdWrapper'); $formRebroadcast->removeDecorator('DtDdWrapper');
$this->view->what = $formWhat;
$this->view->when = $formWhen;
$this->view->repeats = $formRepeats;
$this->view->who = $formWho;
$this->view->style = $formStyle;
$this->view->rr = $formRecord;
$this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
$this->view->rebroadcast = $formRebroadcast;
$this->view->addNewShow = true;
$what = $formWhat->isValid($data); $what = $formWhat->isValid($data);
$when = $formWhen->isValid($data); $when = $formWhen->isValid($data);
if($when) { if($when) {
$when = $formWhen->checkReliantFields($data); $when = $formWhen->checkReliantFields($data, $startDateModified);
} }
if($data["add_show_repeats"]) { if($data["add_show_repeats"]) {
$repeats = $formRepeats->isValid($data); $repeats = $formRepeats->isValid($data);
if($repeats) { if($repeats) {
$repeats = $formRepeats->checkReliantFields($data); $repeats = $formRepeats->checkReliantFields($data);
@ -636,7 +586,6 @@ class ScheduleController extends Zend_Controller_Action
//update this option. //update this option.
$record = false; $record = false;
if ($data['add_show_id'] != -1){ if ($data['add_show_id'] != -1){
$show = new Show($data['add_show_id']);
$data['add_show_record'] = $show->isRecorded(); $data['add_show_record'] = $show->isRecorded();
$record = $formRecord->isValid($data); $record = $formRecord->isValid($data);
$formRecord->getElement('add_show_record')->setOptions(array('disabled' => true)); $formRecord->getElement('add_show_record')->setOptions(array('disabled' => true));
@ -650,32 +599,31 @@ class ScheduleController extends Zend_Controller_Action
if ($user->isAdmin()) { if ($user->isAdmin()) {
Show::create($data); Show::create($data);
} }
//send back a new form for the user. //send back a new form for the user.
$formWhat->reset(); Schedule::createNewFormSections($this->view);
$formWhat->populate(array('add_show_id' => '-1'));
$formWho->reset();
$formWhen->reset();
$formWhen->populate(array('add_show_start_date' => date("Y-m-d"),
'add_show_start_time' => '0:00',
'add_show_duration' => '1:00'));
$formRepeats->reset();
$formRepeats->populate(array('add_show_end_date' => date("Y-m-d")));
$formStyle->reset();
$formRecord->reset();
$formAbsoluteRebroadcast->reset();
$formRebroadcast->reset();
$this->view->newForm = $this->view->render('schedule/add-show-form.phtml'); $this->view->newForm = $this->view->render('schedule/add-show-form.phtml');
} }
else { else {
$this->view->what = $formWhat;
$this->view->when = $formWhen;
$this->view->repeats = $formRepeats;
$this->view->who = $formWho;
$this->view->style = $formStyle;
$this->view->rr = $formRecord;
$this->view->absoluteRebroadcast = $formAbsoluteRebroadcast;
$this->view->rebroadcast = $formRebroadcast;
$this->view->addNewShow = true;
//the form still needs to be "update" since //the form still needs to be "update" since
//the validity test failed. //the validity test failed.
if ($data['add_show_id'] != -1){ if ($data['add_show_id'] != -1){
$this->view->addNewShow = false; $this->view->addNewShow = false;
} }
if (!$startDateModified){
$formWhen->getElement('add_show_start_date')->setOptions(array('disabled' => true));
}
$this->view->form = $this->view->render('schedule/add-show-form.phtml'); $this->view->form = $this->view->render('schedule/add-show-form.phtml');
} }

8
airtime_mvc/application/forms/AddShowAbsoluteRebroadcastDates.php
View File

@ -48,8 +48,8 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
$this->getElement('add_show_rebroadcast_date_absolute_'.$i)->setErrors(array("Day must be specified")); $this->getElement('add_show_rebroadcast_date_absolute_'.$i)->setErrors(array("Day must be specified"));
$valid = false; $valid = false;
} }
if (trim($time) == ""){ if (trim($time) == ""){
$this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array("Time must be specified")); $this->getElement('add_show_rebroadcast_time_absolute_'.$i)->setErrors(array("Time must be specified"));
$valid = false; $valid = false;
@ -60,7 +60,7 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
continue; continue;
} }
$show_start_time = $formData['add_show_start_date']."".$formData['add_show_start_time']; $show_start_time = $formData['add_show_start_date']." ".$formData['add_show_start_time'];
$show_end = new DateTime($show_start_time); $show_end = new DateTime($show_start_time);
$duration = $formData['add_show_duration']; $duration = $formData['add_show_duration'];
@ -70,7 +70,7 @@ class Application_Form_AddShowAbsoluteRebroadcastDates extends Zend_Form_SubForm
$show_end->add(new DateInterval("PT$duration[1]M")); $show_end->add(new DateInterval("PT$duration[1]M"));
$show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast $show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast
$rebroad_start = $day."".$formData['add_show_rebroadcast_time_absolute_'.$i]; $rebroad_start = $day." ".$formData['add_show_rebroadcast_time_absolute_'.$i];
$rebroad_start = new DateTime($rebroad_start); $rebroad_start = new DateTime($rebroad_start);
if($rebroad_start < $show_end) { if($rebroad_start < $show_end) {

8
airtime_mvc/application/forms/AddShowRebroadcastDates.php
View File

@ -53,8 +53,8 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
$this->getElement('add_show_rebroadcast_date_'.$i)->setErrors(array("Day must be specified")); $this->getElement('add_show_rebroadcast_date_'.$i)->setErrors(array("Day must be specified"));
$valid = false; $valid = false;
} }
if (trim($time) == ""){ if (trim($time) == ""){
$this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array("Time must be specified")); $this->getElement('add_show_rebroadcast_time_'.$i)->setErrors(array("Time must be specified"));
$valid = false; $valid = false;
@ -68,7 +68,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
$days = explode(" ", $days); $days = explode(" ", $days);
$day = $days[0]; $day = $days[0];
$show_start_time = $formData['add_show_start_date']."".$formData['add_show_start_time']; $show_start_time = $formData['add_show_start_date']." ".$formData['add_show_start_time'];
$show_end = new DateTime($show_start_time); $show_end = new DateTime($show_start_time);
$duration = $formData['add_show_duration']; $duration = $formData['add_show_duration'];
@ -78,7 +78,7 @@ class Application_Form_AddShowRebroadcastDates extends Zend_Form_SubForm
$show_end->add(new DateInterval("PT$duration[1]M")); $show_end->add(new DateInterval("PT$duration[1]M"));
$show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast $show_end->add(new DateInterval("PT1H"));//min time to wait until a rebroadcast
$rebroad_start = $formData['add_show_start_date']."".$formData['add_show_rebroadcast_time_'.$i]; $rebroad_start = $formData['add_show_start_date']." ".$formData['add_show_rebroadcast_time_'.$i];
$rebroad_start = new DateTime($rebroad_start); $rebroad_start = new DateTime($rebroad_start);
$rebroad_start->add(new DateInterval("P".$day."D")); $rebroad_start->add(new DateInterval("P".$day."D"));

14
airtime_mvc/application/forms/AddShowWhen.php
View File

@ -59,20 +59,22 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
} }
public function checkReliantFields($formData) { public function checkReliantFields($formData, $startDateModified) {
$valid = true; $valid = true;
$now_timestamp = date("Y-m-d H:i:s"); $now_timestamp = date("Y-m-d H:i:s");
$start_timestamp = $formData['add_show_start_date']."".$formData['add_show_start_time']; $start_timestamp = $formData['add_show_start_date']." ".$formData['add_show_start_time'];
$now_epoch = strtotime($now_timestamp); $now_epoch = strtotime($now_timestamp);
$start_epoch = strtotime($start_timestamp); $start_epoch = strtotime($start_timestamp);
if($start_epoch < $now_epoch) { if ((($formData['add_show_id'] != -1) && $startDateModified) || ($formData['add_show_id'] == -1)){
$this->getElement('add_show_start_time')->setErrors(array('Cannot create show in the past')); if($start_epoch < $now_epoch) {
$valid = false; $this->getElement('add_show_start_time')->setErrors(array('Cannot create show in the past'));
} $valid = false;
}
}
if(strtotime("00:00") == strtotime($formData["add_show_duration"])) { if(strtotime("00:00") == strtotime($formData["add_show_duration"])) {
$this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00:00')); $this->getElement('add_show_duration')->setErrors(array('Cannot have duration 00:00'));

12
airtime_mvc/application/models/Dashboard.php
View File

@ -17,8 +17,9 @@ class Application_Model_Dashboard
return null; return null;
} else { } else {
return array("name"=>$row[0]["artist_name"]." - ".$row[0]["track_title"], return array("name"=>$row[0]["artist_name"]." - ".$row[0]["track_title"],
"starts"=>$row[0]["starts"], "starts"=>$row[0]["starts"],
"ends"=>$row[0]["ends"]); "ends"=>$row[0]["ends"]);
} }
} else { } else {
if (count($row) == 0){ if (count($row) == 0){
@ -47,9 +48,12 @@ class Application_Model_Dashboard
//after the last item in the schedule table, then return the show's //after the last item in the schedule table, then return the show's
//name. Else return the last item from the schedule. //name. Else return the last item from the schedule.
$row = array();
$showInstance = ShowInstance::GetCurrentShowInstance($p_timeNow); $showInstance = ShowInstance::GetCurrentShowInstance($p_timeNow);
$row = Schedule::GetCurrentScheduleItem($p_timeNow); if (!is_null($showInstance)){
$instanceId = $showInstance->getShowInstanceId();
$row = Schedule::GetCurrentScheduleItem($p_timeNow, $instanceId);
}
if (is_null($showInstance)){ if (is_null($showInstance)){
if (count($row) == 0){ if (count($row) == 0){
return null; return null;

44
airtime_mvc/application/models/DateHelper.php
View File

@ -18,6 +18,15 @@ class DateHelper
return date("Y-m-d H:i:s", $this->_timestamp); return date("Y-m-d H:i:s", $this->_timestamp);
} }
/**
* Get date of object construction in the format
* YY:mm:dd
*/
function getDate()
{
return date("Y-m-d", $this->_timestamp);
}
/** /**
* Get time of object construction in the format * Get time of object construction in the format
* HH:mm:ss * HH:mm:ss
@ -83,5 +92,40 @@ class DateHelper
return $hours.":".$minutes.":".$seconds.".".$ms; return $hours.":".$minutes.":".$seconds.".".$ms;
} }
/**
* This function formats a time by removing seconds
*
* When we receive a time from the database we get the
* format "hh:mm:ss". But when dealing with show times, we
* do not care about the seconds.
*
* @param int $p_timestamp
* The value which to format.
* @return int
* The timestamp with the new format "hh:mm", or
* the original input parameter, if it does not have
* the correct format.
*/
public static function removeSecondsFromTime($p_timestamp)
{
//Format is in hh:mm:ss. We want hh:mm
$timeExplode = explode(":", $p_timestamp);
if (count($timeExplode) == 3)
return $timeExplode[0].":".$timeExplode[1];
else
return $p_timestamp;
}
public static function getDateFromTimestamp($p_timestamp){
$explode = explode(" ", $p_timestamp);
return $explode[0];
}
public static function getTimeFromTimestamp($p_timestamp){
$explode = explode(" ", $p_timestamp);
return $explode[1];
}
} }

35
airtime_mvc/application/models/Schedule.php
View File

@ -394,7 +394,7 @@ class Schedule {
} }
public static function GetCurrentScheduleItem($p_timeNow){ public static function GetCurrentScheduleItem($p_timeNow, $p_instanceId){
global $CC_CONFIG, $CC_DBC; global $CC_CONFIG, $CC_DBC;
/* Note that usually there will be one result returned. In some /* Note that usually there will be one result returned. In some
@ -409,6 +409,7 @@ class Schedule {
." LEFT JOIN $CC_CONFIG[filesTable] ft" ." LEFT JOIN $CC_CONFIG[filesTable] ft"
." ON st.file_id = ft.id" ." ON st.file_id = ft.id"
." WHERE st.starts <= TIMESTAMP '$p_timeNow'" ." WHERE st.starts <= TIMESTAMP '$p_timeNow'"
." AND st.instance_id = $p_instanceId"
." AND st.ends > TIMESTAMP '$p_timeNow'" ." AND st.ends > TIMESTAMP '$p_timeNow'"
." ORDER BY st.starts DESC" ." ORDER BY st.starts DESC"
." LIMIT 1"; ." LIMIT 1";
@ -733,5 +734,37 @@ class Schedule {
global $CC_CONFIG, $CC_DBC; global $CC_CONFIG, $CC_DBC;
$CC_DBC->query("TRUNCATE TABLE ".$CC_CONFIG["scheduleTable"]); $CC_DBC->query("TRUNCATE TABLE ".$CC_CONFIG["scheduleTable"]);
} }
public static function createNewFormSections($p_view){
$formWhat = new Application_Form_AddShowWhat();
$formWho = new Application_Form_AddShowWho();
$formWhen = new Application_Form_AddShowWhen();
$formRepeats = new Application_Form_AddShowRepeats();
$formStyle = new Application_Form_AddShowStyle();
$formRecord = new Application_Form_AddShowRR();
$formAbsoluteRebroadcast = new Application_Form_AddShowAbsoluteRebroadcastDates();
$formRebroadcast = new Application_Form_AddShowRebroadcastDates();
$formWhat->removeDecorator('DtDdWrapper');
$formWho->removeDecorator('DtDdWrapper');
$formWhen->removeDecorator('DtDdWrapper');
$formRepeats->removeDecorator('DtDdWrapper');
$formStyle->removeDecorator('DtDdWrapper');
$formRecord->removeDecorator('DtDdWrapper');
$formAbsoluteRebroadcast->removeDecorator('DtDdWrapper');
$formRebroadcast->removeDecorator('DtDdWrapper');
$p_view->what = $formWhat;
$p_view->when = $formWhen;
$p_view->repeats = $formRepeats;
$p_view->who = $formWho;
$p_view->style = $formStyle;
$p_view->rr = $formRecord;
$p_view->absoluteRebroadcast = $formAbsoluteRebroadcast;
$p_view->rebroadcast = $formRebroadcast;
$p_view->addNewShow = true;
$formWhat->populate(array('add_show_id' => '-1'));
}
} }

193
airtime_mvc/application/models/Shows.php
View File

@ -318,14 +318,19 @@ class Show {
* certain date. * certain date.
* *
* @param string $p_date * @param string $p_date
* The date which to delete after * The date which to delete after, if null deletes from the current timestamp.
*/ */
public function removeAllInstancesFromDate($p_date){ public function removeAllInstancesFromDate($p_date=null){
global $CC_DBC; global $CC_DBC;
$date = new DateHelper; $date = new DateHelper;
$timestamp = $date->getTimestamp(); $timestamp = $date->getTimestamp();
if(is_null($p_date)) {
$date = new DateHelper;
$p_date = $date->getDate();
}
$showId = $this->getId(); $showId = $this->getId();
$sql = "DELETE FROM cc_show_instances " $sql = "DELETE FROM cc_show_instances "
." WHERE date(starts) >= DATE '$p_date'" ." WHERE date(starts) >= DATE '$p_date'"
@ -333,6 +338,13 @@ class Show {
." AND show_id = $showId"; ." AND show_id = $showId";
$CC_DBC->query($sql); $CC_DBC->query($sql);
/*
CcShowInstancesQuery::create()
->filterByDbShowId($showId)
->filterByDbStartTime($p_date, Criteria::GREATER_EQUAL)
->delete();
*/
} }
/** /**
@ -402,6 +414,19 @@ class Show {
} }
} }
/**
* Indicate whether the starting point of the show is in the
* past.
*
* @return boolean
* true if the StartDate is in the past, false otherwise
*/
public function isStartDateTimeInPast(){
$date = new DateHelper;
$current_timestamp = $date->getTimestamp();
return ($current_timestamp > $this->getStartDate()." ".$this->getStartTime());
}
/** /**
* Get the ID's of future instance of the current show. * Get the ID's of future instance of the current show.
* *
@ -533,11 +558,13 @@ class Show {
public static function deletePossiblyInvalidInstances($p_data, $p_show, $p_endDate, $isRecorded, $repeatType) public static function deletePossiblyInvalidInstances($p_data, $p_show, $p_endDate, $isRecorded, $repeatType)
{ {
if ($p_data['add_show_repeats'] != $p_show->isRepeating() if (($p_data['add_show_repeats'] != $p_show->isRepeating()) || ($isRecorded && !$p_data['add_show_repeats'])){
|| $isRecorded){ //repeat option was toggled.
//repeat option was toggled or show is recorded.
$p_show->deleteAllInstances(); $p_show->deleteAllInstances();
} }
if($isRecorded && $p_data['add_show_repeats']) {
$p_show->removeAllInstancesFromDate();
}
if ($p_data['add_show_duration'] != $p_show->getDuration()){ if ($p_data['add_show_duration'] != $p_show->getDuration()){
//duration has changed //duration has changed
@ -545,6 +572,16 @@ class Show {
} }
if ($p_data['add_show_repeats']){ if ($p_data['add_show_repeats']){
if (($repeatType == 1 || $repeatType == 2) &&
$p_data['add_show_start_date'] != $p_show->getStartDate()){
//start date has changed when repeat type is bi-weekly or monthly.
//This screws up the repeating positions of show instances, so lets
//just delete them for now.
$p_show->deleteAllInstances();
}
if ($p_data['add_show_start_date'] != $p_show->getStartDate() if ($p_data['add_show_start_date'] != $p_show->getStartDate()
|| $p_data['add_show_start_time'] != $p_show->getStartTime()){ || $p_data['add_show_start_time'] != $p_show->getStartTime()){
//start date/time has changed //start date/time has changed
@ -557,7 +594,7 @@ class Show {
$p_show->updateStartDateTime($p_data, $p_endDate); $p_show->updateStartDateTime($p_data, $p_endDate);
} }
if ($repeatType != $p_show->getRepeatType()){ if ($repeatType != $p_show->getRepeatType()){
//repeat type changed. //repeat type changed.
$p_show->deleteAllInstances(); $p_show->deleteAllInstances();
@ -571,7 +608,8 @@ class Show {
if (count($intersect) != count($p_data['add_show_day_check'])){ if (count($intersect) != count($p_data['add_show_day_check'])){
$repeatingDaysChanged = true; $repeatingDaysChanged = true;
} }
} else { }
else {
$repeatingDaysChanged = true; $repeatingDaysChanged = true;
} }
@ -589,7 +627,8 @@ class Show {
if ((strlen($p_show->getRepeatingEndDate()) == 0) == $p_data['add_show_no_end']){ if ((strlen($p_show->getRepeatingEndDate()) == 0) == $p_data['add_show_no_end']){
//show "Never Ends" option was toggled. //show "Never Ends" option was toggled.
if ($p_data['add_show_no_end']){ if ($p_data['add_show_no_end']){
} else { }
else {
$p_show->removeAllInstancesFromDate($p_endDate); $p_show->removeAllInstancesFromDate($p_endDate);
} }
} }
@ -608,7 +647,7 @@ class Show {
/** /**
* Create a show. * Create a show.
* *
* Note: end dates are inclusive. * Note: end dates are non inclusive.
* *
* @param array $data * @param array $data
* @return int * @return int
@ -685,7 +724,8 @@ class Show {
$showDay->setDbShowId($showId); $showDay->setDbShowId($showId);
$showDay->setDbRecord($isRecorded); $showDay->setDbRecord($isRecorded);
$showDay->save(); $showDay->save();
} else { }
else {
foreach ($data['add_show_day_check'] as $day) { foreach ($data['add_show_day_check'] as $day) {
if ($startDow !== $day){ if ($startDow !== $day){
@ -717,16 +757,20 @@ class Show {
} }
} }
$date = new DateHelper();
$currentTimestamp = $date->getTimestamp();
//check if we are adding or updating a show, and if updating //check if we are adding or updating a show, and if updating
//erase all the show's show_rebroadcast information first. //erase all the show's future show_rebroadcast information first.
if ($data['add_show_id'] != -1){ if (($data['add_show_id'] != -1) && $data['add_show_rebroadcast']){
CcShowRebroadcastQuery::create()->filterByDbShowId($data['add_show_id'])->delete(); CcShowRebroadcastQuery::create()
->filterByDbShowId($data['add_show_id'])
//->filterByDbStartTime($currentTimestamp, Criteria::GREATER_EQUAL)
->delete();
} }
//adding rows to cc_show_rebroadcast //adding rows to cc_show_rebroadcast
if ($isRecorded && $data['add_show_rebroadcast'] && $repeatType != -1) { if (($isRecorded && $data['add_show_rebroadcast']) && ($repeatType != -1)) {
for ($i=1; $i<=10; $i++) { for ($i=1; $i<=10; $i++) {
if ($data['add_show_rebroadcast_date_'.$i]) { if ($data['add_show_rebroadcast_date_'.$i]) {
$showRebroad = new CcShowRebroadcast(); $showRebroad = new CcShowRebroadcast();
$showRebroad->setDbDayOffset($data['add_show_rebroadcast_date_'.$i]); $showRebroad->setDbDayOffset($data['add_show_rebroadcast_date_'.$i]);
@ -735,10 +779,9 @@ class Show {
$showRebroad->save(); $showRebroad->save();
} }
} }
} else if ($isRecorded && $data['add_show_rebroadcast'] && $repeatType == -1){ }
else if ($isRecorded && $data['add_show_rebroadcast'] && ($repeatType == -1)){
for ($i=1; $i<=10; $i++) { for ($i=1; $i<=10; $i++) {
if ($data['add_show_rebroadcast_date_absolute_'.$i]) { if ($data['add_show_rebroadcast_date_absolute_'.$i]) {
$sql = "SELECT date '{$data['add_show_rebroadcast_date_absolute_'.$i]}' - date '{$data['add_show_start_date']}' "; $sql = "SELECT date '{$data['add_show_rebroadcast_date_absolute_'.$i]}' - date '{$data['add_show_start_date']}' ";
$r = $con->query($sql); $r = $con->query($sql);
@ -845,30 +888,34 @@ class Show {
private static function populateNonRepeatingShow($show_id, $first_show, $start_time, $duration, $day, $record, $end_timestamp) private static function populateNonRepeatingShow($show_id, $first_show, $start_time, $duration, $day, $record, $end_timestamp)
{ {
global $CC_DBC; global $CC_DBC;
$next_date = $first_show." ".$start_time; $next_date = $first_show." ".$start_time;
if (strtotime($next_date) < strtotime($end_timestamp)) { if (strtotime($next_date) < strtotime($end_timestamp)) {
$start = $next_date; $start = $next_date;
$sql = "SELECT timestamp '{$start}' + interval '{$duration}'"; $sql = "SELECT timestamp '{$start}' + interval '{$duration}'";
$end = $CC_DBC->GetOne($sql); $end = $CC_DBC->GetOne($sql);
$date = new DateHelper();
$currentTimestamp = $date->getTimestamp();
$show = new Show($show_id); $show = new Show($show_id);
if ($show->hasInstance()){ if ($show->hasInstance()){
$ccShowInstance = $show->getInstance(); $ccShowInstance = $show->getInstance();
$newInstance = false; $newInstance = false;
} else { }
else {
$ccShowInstance = new CcShowInstances(); $ccShowInstance = new CcShowInstances();
$newInstance = true; $newInstance = true;
} }
$ccShowInstance->setDbShowId($show_id); if ($newInstance || $ccShowInstance->getDbStarts() > $currentTimestamp){
$ccShowInstance->setDbStarts($start); $ccShowInstance->setDbShowId($show_id);
$ccShowInstance->setDbEnds($end); $ccShowInstance->setDbStarts($start);
$ccShowInstance->setDbRecord($record); $ccShowInstance->setDbEnds($end);
$ccShowInstance->save(); $ccShowInstance->setDbRecord($record);
$ccShowInstance->save();
}
$show_instance_id = $ccShowInstance->getDbId(); $show_instance_id = $ccShowInstance->getDbId();
$showInstance = new ShowInstance($show_instance_id); $showInstance = new ShowInstance($show_instance_id);
@ -890,14 +937,16 @@ class Show {
$sql = "SELECT timestamp '{$rebroadcast_start_time}' + interval '{$duration}'"; $sql = "SELECT timestamp '{$rebroadcast_start_time}' + interval '{$duration}'";
$rebroadcast_end_time = $CC_DBC->GetOne($sql); $rebroadcast_end_time = $CC_DBC->GetOne($sql);
$newRebroadcastInstance = new CcShowInstances(); if ($rebroadcast_start_time > $currentTimestamp){
$newRebroadcastInstance->setDbShowId($show_id); $newRebroadcastInstance = new CcShowInstances();
$newRebroadcastInstance->setDbStarts($rebroadcast_start_time); $newRebroadcastInstance->setDbShowId($show_id);
$newRebroadcastInstance->setDbEnds($rebroadcast_end_time); $newRebroadcastInstance->setDbStarts($rebroadcast_start_time);
$newRebroadcastInstance->setDbRecord(0); $newRebroadcastInstance->setDbEnds($rebroadcast_end_time);
$newRebroadcastInstance->setDbRebroadcast(1); $newRebroadcastInstance->setDbRecord(0);
$newRebroadcastInstance->setDbOriginalShow($show_instance_id); $newRebroadcastInstance->setDbRebroadcast(1);
$newRebroadcastInstance->save(); $newRebroadcastInstance->setDbOriginalShow($show_instance_id);
$newRebroadcastInstance->save();
}
} }
} }
RabbitMq::PushSchedule(); RabbitMq::PushSchedule();
@ -920,6 +969,9 @@ class Show {
$rebroadcasts = $CC_DBC->GetAll($sql); $rebroadcasts = $CC_DBC->GetAll($sql);
$show = new Show($show_id); $show = new Show($show_id);
$date = new DateHelper();
$currentTimestamp = $date->getTimestamp();
while(strtotime($next_date) <= strtotime($end_timestamp) && (strtotime($last_show) > strtotime($next_date) || is_null($last_show))) { while(strtotime($next_date) <= strtotime($end_timestamp) && (strtotime($last_show) > strtotime($next_date) || is_null($last_show))) {
$start = $next_date; $start = $next_date;
@ -934,11 +986,17 @@ class Show {
$ccShowInstance = new CcShowInstances(); $ccShowInstance = new CcShowInstances();
$newInstance = true; $newInstance = true;
} }
$ccShowInstance->setDbShowId($show_id);
$ccShowInstance->setDbStarts($start); /* When editing the start/end time of a repeating show, we don't want to
$ccShowInstance->setDbEnds($end); * change shows that started in the past. So check the start time.
$ccShowInstance->setDbRecord($record); */
$ccShowInstance->save(); if ($newInstance || $ccShowInstance->getDbStarts() > $currentTimestamp){
$ccShowInstance->setDbShowId($show_id);
$ccShowInstance->setDbStarts($start);
$ccShowInstance->setDbEnds($end);
$ccShowInstance->setDbRecord($record);
$ccShowInstance->save();
}
$show_instance_id = $ccShowInstance->getDbId(); $show_instance_id = $ccShowInstance->getDbId();
$showInstance = new ShowInstance($show_instance_id); $showInstance = new ShowInstance($show_instance_id);
@ -957,14 +1015,16 @@ class Show {
$sql = "SELECT timestamp '{$rebroadcast_start_time}' + interval '{$duration}'"; $sql = "SELECT timestamp '{$rebroadcast_start_time}' + interval '{$duration}'";
$rebroadcast_end_time = $CC_DBC->GetOne($sql); $rebroadcast_end_time = $CC_DBC->GetOne($sql);
$newRebroadcastInstance = new CcShowInstances(); if ($rebroadcast_start_time > $currentTimestamp){
$newRebroadcastInstance->setDbShowId($show_id); $newRebroadcastInstance = new CcShowInstances();
$newRebroadcastInstance->setDbStarts($rebroadcast_start_time); $newRebroadcastInstance->setDbShowId($show_id);
$newRebroadcastInstance->setDbEnds($rebroadcast_end_time); $newRebroadcastInstance->setDbStarts($rebroadcast_start_time);
$newRebroadcastInstance->setDbRecord(0); $newRebroadcastInstance->setDbEnds($rebroadcast_end_time);
$newRebroadcastInstance->setDbRebroadcast(1); $newRebroadcastInstance->setDbRecord(0);
$newRebroadcastInstance->setDbOriginalShow($show_instance_id); $newRebroadcastInstance->setDbRebroadcast(1);
$newRebroadcastInstance->save(); $newRebroadcastInstance->setDbOriginalShow($show_instance_id);
$newRebroadcastInstance->save();
}
} }
$sql = "SELECT timestamp '{$start}' + interval '{$interval}'"; $sql = "SELECT timestamp '{$start}' + interval '{$interval}'";
@ -1132,41 +1192,6 @@ class Show {
return $event; return $event;
} }
public static function getDateFromTimestamp($p_timestamp){
$explode = explode(" ", $p_timestamp);
return $explode[0];
}
public static function getTimeFromTimestamp($p_timestamp){
$explode = explode(" ", $p_timestamp);
return $explode[1];
}
/**
* This function formats a time by removing seconds
*
* When we receive a time from the database we get the
* format "hh:mm:ss". But when dealing with show times, we
* do not care about the seconds.
*
* @param int $p_timestamp
* The value which to format.
* @return int
* The timestamp with the new format "hh:mm", or
* the original input parameter, if it does not have
* the correct format.
*/
public static function removeSecondsFromTime($p_timestamp)
{
//Format is in hh:mm:ss. We want hh:mm
$timeExplode = explode(":", $p_timestamp);
if (count($timeExplode) == 3)
return $timeExplode[0].":".$timeExplode[1];
else
return $p_timestamp;
}
} }
class ShowInstance { class ShowInstance {

1
install/apache/airtime-vhost
View File

@ -1,6 +1,5 @@
<VirtualHost *:80> <VirtualHost *:80>
ServerAdmin foo@bar.org ServerAdmin foo@bar.org
ServerName inferno.web.id
DocumentRoot /var/www/airtime/public DocumentRoot /var/www/airtime/public
<Directory /var/www/airtime/public> <Directory /var/www/airtime/public>

34
utils/airtime-check-system.php
View File

@ -7,6 +7,8 @@ require_once "$airtime_base_dir/library/php-amqplib/amqp.inc";
set_error_handler("myErrorHandler"); set_error_handler("myErrorHandler");
AirtimeCheck::GetCpuInfo();
AirtimeCheck::GetRamInfo();
AirtimeCheck::CheckOsTypeVersion(); AirtimeCheck::CheckOsTypeVersion();
AirtimeCheck::CheckConfigFilesExist(); AirtimeCheck::CheckConfigFilesExist();
@ -157,6 +159,32 @@ class AirtimeCheck {
output_status("ICECAST_PROCESS_ID", $status); output_status("ICECAST_PROCESS_ID", $status);
} }
public static function GetCpuInfo()
{
$command = "cat /proc/cpuinfo |grep -m 1 'model name' ";
exec($command, $output, $result);
$choppedStr = split(":", $output[0]);
$status = trim($choppedStr[1]);
output_status("CPU", $status);
}
public static function GetRamInfo()
{
$command = "cat /proc/meminfo |grep 'MemTotal' ";
exec($command, $output, $result);
$choppedStr = split(":", $output[0]);
$status = trim($choppedStr[1]);
output_status("Total RAM", $status);
$output = null;
$command = "cat /proc/meminfo |grep 'MemFree' ";
exec($command, $output, $result);
$choppedStr = split(":", $output[0]);
$status = trim($choppedStr[1]);
output_status("Free RAM", $status);
}
public static function CheckConfigFilesExist() public static function CheckConfigFilesExist()
{ {
//echo PHP_EOL."Verifying Config Files in /etc/airtime".PHP_EOL; //echo PHP_EOL."Verifying Config Files in /etc/airtime".PHP_EOL;
@ -381,6 +409,12 @@ class AirtimeCheck {
$os_string = "Unknown"; $os_string = "Unknown";
} }
// Figure out if 32 or 64 bit
$command = "file -b /sbin/init";
exec($command, $output, $result);
$splitStr = split(",", $output[0]);
$os_string .= $splitStr[1];
output_status("OS", $os_string); output_status("OS", $os_string);
} }
} }