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

Merge branch '2.5.x' into 2.5.x-saas

This commit is contained in:
Albert Santoni 2014-01-27 12:01:11 -05:00
parent 49474ab5c4 d5112f0368
commit ed78625fce
5 changed files with 100 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -162,6 +162,13 @@ class Application_Form_AddShowWhen extends Zend_Form_SubForm
}
/* We need to know the show duration broken down into hours and minutes
* They are used for checking overlapping shows and for validating
* rebroadcast instances
*/
$hours = $duration->format("%h");
$minutes = $duration->format("%i");
/* Check if show is overlapping
* We will only do this check if the show is valid
* upto this point

3
airtime_mvc/application/models/Scheduler.php
View File

@ -515,6 +515,9 @@ class Application_Model_Scheduler
private function insertAfter($scheduleItems, $mediaItems, $filesToInsert=null, $adjustSched=true, $moveAction=false)
{
try {
// temporary fix for CC-5665
set_time_limit(180);
$affectedShowInstances = array();
//dont want to recalculate times for moved items

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

@ -920,41 +920,6 @@ SQL;
->save();
}
/**
* Generate all the repeating shows in the given range.
*
* @param DateTime $p_startTimestamp
* In UTC format.
* @param DateTime $p_endTimestamp
* In UTC format.
*/
public static function populateAllShowsInRange($p_startTimestamp, $p_endTimestamp)
{
$con = Propel::getConnection();
$endTimeString = $p_endTimestamp->format("Y-m-d H:i:s");
if (!is_null($p_startTimestamp)) {
$startTimeString = $p_startTimestamp->format("Y-m-d H:i:s");
} else {
$today_timestamp = new DateTime("now", new DateTimeZone("UTC"));
$startTimeString = $today_timestamp->format("Y-m-d H:i:s");
}
$stmt = $con->prepare("
SELECT * FROM cc_show_days
WHERE last_show IS NULL
OR first_show < :endTimeString AND last_show > :startTimeString");
$stmt->bindParam(':endTimeString', $endTimeString);
$stmt->bindParam(':startTimeString', $startTimeString);
$stmt->execute();
$res = $stmt->fetchAll();
foreach ($res as $row) {
Application_Model_Show::populateShow($row, $p_endTimestamp);
}
}
/**
*
* @param DateTime $start

139
airtime_mvc/application/services/ShowService.php
View File

@ -667,11 +667,7 @@ SQL;
$showId = $ccShowInstance->getDbShowId();
if ($singleInstance) {
$ccShowInstances = CcShowInstancesQuery::create()
->filterByDbShowId($showId)
->filterByDbStarts($ccShowInstance->getDbStarts(), Criteria::GREATER_EQUAL)
->filterByDbEnds($ccShowInstance->getDbEnds(), Criteria::LESS_EQUAL)
->find();
$ccShowInstances = array($ccShowInstance);
} else {
$ccShowInstances = CcShowInstancesQuery::create()
->filterByDbShowId($showId)
@ -680,7 +676,9 @@ SQL;
}
if (gmdate("Y-m-d H:i:s") <= $ccShowInstance->getDbEnds()) {
$this->deleteShowInstances($ccShowInstances, $ccShowInstance->getDbShowId());
$this->deleteShowInstances($ccShowInstances, $showId);
} else {
throw new Exception("Cannot delete a show instance in the past");
}
Application_Model_StoredFile::updatePastFilesIsScheduled();
@ -688,6 +686,7 @@ SQL;
Application_Model_RabbitMq::PushSchedule();
$con->commit();
return $showId;
} catch (Exception $e) {
$con->rollback();
@ -723,6 +722,78 @@ SQL;
CcShowQuery::create()
->filterByDbId($showId)
->delete();
/* There is only one cc_show_instance if the user selects 'Delete This Instance'
* There is more than one cc_show_instance if the user selects 'Delete This
* Instance and All Following'. We only need to set the last_show value
* when 'Delete This Instance and All Following' has been selected
*/
} elseif (count($ccShowInstances) > 1) {
$this->setLastRepeatingShowDate($showId);
}
}
private function setLastRepeatingShowDate($showId)
{
$ccShowInstances = CcShowInstancesQuery::create()
->filterByDbShowId($showId)
->filterByDbModifiedInstance(false)
->filterByDbRebroadcast(0)
->orderByDbStarts()
->find();
/* We need to update the last_show in cc_show_days so the instances
* don't get recreated as the user moves forward in the calendar
*/
$lastShowDays = array();
//get the show's timezone
$ccShow = CcShowQuery::create()->findPk($showId);
if ($ccShow->isRepeating()) {
$showTimezone = $ccShow->getFirstRepeatingCcShowDay()->getDbTimezone();
} else {
$showTimezone = $ccShow->getFirstCcShowDay()->getDbTimezone();
}
/* Creates an array where the key is the day of the week (monday,
* tuesday, etc.) and the value is the last show date for each
* day of the week. We will use this array to update the last_show
* for each cc_show_days entry of a cc_show
*/
foreach ($ccShowInstances as $instance) {
$instanceStartDT = $instance->getDbStarts(null);
$instanceStartDT->setTimezone(new DateTimeZone($showTimezone));
$lastShowDays[$instanceStartDT->format("w")] = $instanceStartDT;
}
foreach ($lastShowDays as $dayOfWeek => $lastShowStartDT) {
$ccShowDay = CcShowDaysQuery::create()
->filterByDbShowId($showId)
->filterByDbDay($dayOfWeek)
->filterByDbRepeatType(-1, Criteria::NOT_EQUAL)
->findOne();
if (isset($ccShowDay)) {
$lastShowStartDT->setTimeZone(new DateTimeZone(
$ccShowDay->getDbTimezone()));
$lastShowEndDT = Application_Service_CalendarService::addDeltas(
$lastShowStartDT, 1, 0);
$ccShowDay
->setDbLastShow($lastShowEndDT->format("Y-m-d"))
->save();
}
}
// NOTE: Some cc_show_day records may not get updated because there may not be an instance
// left on one of the repeating days so we have to find the entries where the last_show is
// still null
$showDays = CcShowDaysQuery::create()
->filterByDbShowId($showId)
->filterByDbRepeatType(0, Criteria::GREATER_EQUAL)
->filterByDbLastShow(null)
->find();
foreach ($showDays as $showDay) {
$showDay->setDbLastShow($showDay->getDbFirstShow())->save();
}
}
@ -739,50 +810,6 @@ SQL;
if ($ccShowInstances->isEmpty()) {
return true;
}
/* We need to update the last_show in cc_show_days so the instances
* don't get recreated as the user moves forward in the calendar
*/
else if (count($ccShowInstances) >= 1) {
$lastShowDays = array();
//get the show's timezone
$ccShow = CcShowQuery::create()->findPk($showId);
if ($ccShow->isRepeating()) {
$showTimezone = $ccShow->getFirstRepeatingCcShowDay()->getDbTimezone();
} else {
$showTimezone = $ccShow->getFirstCcShowDay()->getDbTimezone();
}
/* Creates an array where the key is the day of the week (monday,
* tuesday, etc.) and the value is the last show date for each
* day of the week. We will use this array to update the last_show
* for each cc_show_days entry of a cc_show
*/
foreach ($ccShowInstances as $instance) {
$instanceStartDT = $instance->getDbStarts(null);
$instanceStartDT->setTimezone(new DateTimeZone($showTimezone));
$lastShowDays[$instanceStartDT->format("w")] = $instanceStartDT;
}
foreach ($lastShowDays as $dayOfWeek => $lastShowStartDT) {
$ccShowDay = CcShowDaysQuery::create()
->filterByDbShowId($showId)
->filterByDbDay($dayOfWeek)
->filterByDbRepeatType(-1, Criteria::NOT_EQUAL)
->findOne();
if (isset($ccShowDay)) {
$lastShowStartDT->setTimeZone(new DateTimeZone(
$ccShowDay->getDbTimezone()));
$lastShowEndDT = Application_Service_CalendarService::addDeltas(
$lastShowStartDT, 1, 0);
$ccShowDay
->setDbLastShow($lastShowEndDT->format("Y-m-d"))
->save();
}
}
}
return false;
}
@ -1251,6 +1278,18 @@ SQL;
return $dt;
}
/**
*
* Returns a DateTime object of when the next repeating show that repeats
* monthly, by day of the week (i.e. every fourth Tuesday) should be created
*
* @param DateTime $start
* $start only has the year and month of the next show
* @param string $timezone
* @param string (i.e. '14:30' $startTime
* @param string (i.e. 'first', 'second') $weekNumberOfMonth
* @param string (i.e. 'Monday') $dayOfWeek
*/
private function getNextMonthlyWeeklyRepeatDate(
$start,
$timezone,

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

@ -221,10 +221,7 @@ class AirtimeCheck {
}
public static function show_log_file($log) {
exec("tail -5 $log", $output);
self::output_comment("Displaying log file $log");
self::output_comment($output);
self::output_comment("");
self::output_comment("Check the log file $log");
self::output_comment("");
}