DTux/moha
1
0
Fork 0
Code Activity

finished rdc_temperature_int_ext.php\ncontinued events.php (recurrence)

Browse Source
This commit is contained in:
Daniel Tartavel
2022-08-28 00:06:24 +02:00
parent f42df97c5c
commit b5c30b1ae4
6 changed files with 209 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
events.php
View File

@@ -16,66 +16,155 @@ function checkEvents()
{
$events = array();
}*/
$now = now();
foreach ($events as $key => &$event)
{
$now = now();
if (!empty($event->startDatetime))
if($event->dateTimeEvent < $now)
{
logger(DEBUG, _("StartDatetime is set"), __FILE__ . ":" . __LINE__);
if($event->dateTimeEvent < $now)
if (is_callable($event->function))
{
logger(DEBUG, _("Event must be executed"), __FILE__ . ":" . __LINE__);
if (!empty($event->exceptionInterval) and $event->isInterval == true)
{
logger(DEBUG, _("Testing exceptions"), __FILE__ . ":" . __LINE__);
foreach($event->exceptionInterval as $key => $value)
{
if($now > $value->start and $now < $value->end)
{
$exception = true;
}elseif($now > $value->stop)
{
unset($event->exceptionInterval[$key]);
}
}
}
if ($exception === false)
{
if (is_callable($event->function))
{
logger(DEBUG, _("executing function") . $event->function[1], __FILE__ . ":" . __LINE__);
$event->function();
$event->published = $now;
}else
{
logger(DEBUG, sprintf(_("sending command set %s => %s for %s"), $event->param ,bool2string($event->value), $event->device->friendlyName), __FILE__ . ":" . __LINE__);
publish(mktopic($event->device), array($event->param => $event->value), "set");
$event->published = $now;
}
if ($event->method !== null) $event->device->properties[$event->param]["method"] = $event->method;
if (($event->dateTimeEvent->add($event->recurrenceInterval)) === false)
{
logger(ERROR, _("Error in adding interval to event recurrence. event: ") . $key, __FILE__ . ":" . __LINE__);
}
}
logger(DEBUG, _("executing function") . $event->function[1], __FILE__ . ":" . __LINE__);
$event->function($event);
}elseif (is_object($event->device))
{
logger(DEBUG, sprintf(_("sending command set %s => %s for %s"), $event->param ,bool2string($event->value), $event->device->friendlyName), __FILE__ . ":" . __LINE__);
publish(mktopic($event->device), array($event->param => $event->value), "set");
if ($event->method !== null) $event->device->properties[$event->param]["method"] = $event->method;
}else
{
logger(ERROR, _("Event is malformed") . $key, __FILE__ . ":" . __LINE__);
}
}elseif (!empty($event->dateTimeEvent) and $event->dateTimeEvent < now())
$event->published = $now;
}
if (!empty($event->recurrence))
{
logger(DEBUG, sprintf(_("Sending command set %s => %s to %s"),$event->param, bool2string($event->value), $event->device->friendlyName), __FILE__ . ":" . __LINE__);
$mid = publish(mktopic($event->device), array($event->param => $event->value), "set"); //, $key);null
$event->published = $now;
if ($event->method !== null)
{
$event->device->properties[$event->param]["method"] = $event->method;
}
//echo "#################################\nUnsetting event $key \n###########################" . EOL;
unset($events[$key]);
nextOccurence($event, $key, $now);
}else
{
unset($events[$key]);
}
}
//print_r($events);
//$logLevel = $oldLevel;
}
function nextIntervalDate(&$event)
{
if (($event->dateTimeEvent = $event->dateTimeEvent->add($event->recurrence)) === false)
{
logger(ERROR, _("Error in adding interval to event recurrence. event: ") . $eventKey, __FILE__ . ":" . __LINE__);
return false;
}
}
function nextDate(&$event)
{
$isDate = false;
$date = new DateTime;
$year = $event->dateTimeEvent->format("Y");
$month = $event->dateTimeEvent->format("M");
$day = $event->dateTimeEvent->format("D");
$hour = $event->dateTimeEvent->format("H");
$minutes = $event->dateTimeEvent->format("I");
$seconds = $event->dateTimeEvent->format("S");
$temp = "";
for ($x = 0; $x < strlen($event->recurrence); $x++)
{
switch ($event->recurrence[$x])
{
case "P":
$isDate = true;
break;
case "T":
$isDate = false;
break;
case "Y":
$year = $temp;
$temp = 0;
break;
case "M":
if ($isdate)
{
$month = $temp;
}else
{
$minutes = $temp;
}
$temp = 0;
break;
case "W":
$temp = 0;
break;
case "H":
$hour = $temp;
$temp = 0;
case "S":
$seconds = $temp;
$temp = 0;
default:
$temp = $event->recurrence[$x] . $temp;
break;
}
}
if ($month != 0)
{
$year += 1;
}elseif ($day != 0)
{
$month += 1;
}elseif ($hour != 0)
{
$day = +1;
}elseif ($minutes != 0)
{
$hour = +1;
}
$event->dateTimeEvent->setDate(intval($year), intval($month), intval($day));
$event->dateTimeEvent->setTime(intval($hour), intval($minutes), intval($seconds));
}
function exceptionsTest(&$event, $now)
{
$exception = false;
logger(DEBUG, _("Testing exceptions"), __FILE__ . ":" . __LINE__);
if (!empty($event->exceptionInterval))
{
foreach($event->exceptionInterval as $key => $value)
{
if($now > $value->start and $now < $value->end)
{
$exception = true;
}elseif($now > $value->stop)
{
unset($event->exceptionInterval[$key]);
}
}
}
return $exception;
}
function nextOccurence(&$event, $eventKey, $now)
{
$n = 0;
logger(DEBUG, _("Calculating next occurence"), __FILE__ . ":" . __LINE__);
do
{
if ($event->isInterval === true)
{
nextIntervalDate($event);
}else
{
nextDate($event);
}
if ($n++ > 1000)
{
logger(ERROR, _("infinite loop"), __FILE__ . ":" . __LINE__);
return 1;
}
}while (exceptionsTest($event, $now) === true); // loop until the date is not comprise in exceptions dates
}
// datetime format : "yyyy-mm-dd hh:mm:ss"
@@ -109,7 +198,7 @@ function setRecurrentEvent($function, $ieeeAddress, string $property, $value, bo
if (!empty($days)) $string .= $days . "D";
$string .= "T";
if (!empty($hours)) $string .= $hours . "H";
if (!empty($months)) $string .= $months . "M";
if (!empty($minutes)) $string .= $minutes . "M";
if (!empty($seconds)) $string .= $seconds . "S";
logger(DEBUG, _("reccurrent event string : ") . $string, __FILE__ . ":" . __LINE__);
@@ -118,10 +207,17 @@ function setRecurrentEvent($function, $ieeeAddress, string $property, $value, bo
// pb in recurrent event in case of date and not interval
if ($isInterval === true)
{
$event->recurrenceInterval = new DateInterval($string);
if (($event->dateTimeEvent->add($event->recurrence)) === false)
{
logger(ERROR, _("Error in event recurrence. event: ") . $key, __FILE__ . ":" . __LINE__);
return true;
}
$event->recurrence = new DateInterval($string);
$event->isInterval = true;
}else
{
$event->recurrenceInterval = 0;
$event->recurrence = $string;
$event->isInterval = false;
}
if (!empty($startDatetime))
@@ -131,12 +227,13 @@ function setRecurrentEvent($function, $ieeeAddress, string $property, $value, bo
{
$event->startDatetime = now();
}
$event->dateTimeEvent = $event->startDatetime;
if (!empty($stopDatetime))
{
$event->stopDatetime = new datetime($stopDatetime);
}
$event->dateTimeEvent = $event->startDatetime;
if (!empty($ieeeAddress))
{
$event->ieee_address = $ieeeAddress;
@@ -146,16 +243,9 @@ function setRecurrentEvent($function, $ieeeAddress, string $property, $value, bo
$event->value = $value;
}
if ($event->recurrenceInterval != 0)
{
if (($event->dateTimeEvent->add($event->recurrenceInterval)) === false)
{
logger(ERROR, _("Error in event recurrence. event: ") . $key, __FILE__ . ":" . __LINE__);
return 1;
}
}
if ($method !== null) $event->method = $method;
return 0;
$events[] = $event;
return false;
}
function setDelay(device &$deviceObject, float $delay, string $unit, string $property, $value, $function, bool $replace=false, int $method = null)