FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 19:36:02 +00:00
Code Issues Releases Wiki Activity

Cron.pm: wip

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27876 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
herrmannj 2023-08-22 23:36:18 +00:00
parent 560d36649b
commit a4921710dc
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
fhem/lib/FHEM/Scheduler/Cron.pm
View File

@ -8,7 +8,7 @@ use strict;
use warnings; use warnings;
use utf8; use utf8;
use POSIX qw( strftime ); use POSIX qw( strftime );
use List::Util qw ( any first ); use List::Util qw ( any first min );
use Time::HiRes qw( time ); use Time::HiRes qw( time );
use Time::Local qw( timelocal ); use Time::Local qw( timelocal );
@ -408,20 +408,39 @@ sub _next_date {
$inclusive?'at or after (inclusive)':'after (exclusive)', $inclusive?'at or after (inclusive)':'after (exclusive)',
($from_date =~ m/(\d{4})(\d{2})(\d{2})/)) if $ENV{EXTENDED_DEBUG}; ($from_date =~ m/(\d{4})(\d{2})(\d{2})/)) if $ENV{EXTENDED_DEBUG};
# set of possible dates, based on the different methods
my @set;
# the mdays/months # the mdays/months
if (scalar @{$self->{list_of_mdays}}) { if (scalar @{$self->{list_of_mdays}}) {
$self->{next_calender_date} = $self->_next_calendar_date($from_date, $inclusive); # check if cached value can be used
if (($self->{working_date} and $self->{next_calender_date}) and
(($inclusive and $self->{next_calender_date} >= $self->{working_date}) or
($self->{next_calender_date} > $self->{working_date}))) {
$self->log(5, 'use cached calender date %04d-%02d-%02d', ($self->{next_calender_date} =~ m/(\d{4})(\d{2})(\d{2})/)) if $ENV{EXTENDED_DEBUG};
push @set, $self->{next_calender_date};
} else {
push @set, $self->{next_calender_date} = $self->_next_calendar_date($from_date, $inclusive);
}
} }
if (scalar @{$self->{list_of_or_wdays}}) { if (scalar @{$self->{list_of_or_wdays}}) {
$self->{next_weekday_date} = $self->_next_weekday_date($from_date, $inclusive); # check if cached value can be used
if (($self->{working_date} and $self->{next_weekday_date}) and
(($inclusive and $self->{next_weekday_date} >= $self->{working_date}) or
($self->{next_weekday_date} > $self->{working_date}))) {
$self->log(5, 'use cached weekday date %04d-%02d-%02d', ($self->{next_weekday_date} =~ m/(\d{4})(\d{2})(\d{2})/)) if $ENV{EXTENDED_DEBUG};
push @set, $self->{next_weekday_date};
} else {
push @set, $self->{next_weekday_date} = $self->_next_weekday_date($from_date, $inclusive);
}
} }
# whatever comes first
my $result = min @set;
$self->{current_work_date} = $self->{next_calender_date}; $self->log(5, 'found date %04d-%02d-%02d',
#exit(0); # $inclusive?'at or after (inclusive)':'after (exclusive)',
($result =~ m/(\d{4})(\d{2})(\d{2})/)) if $ENV{EXTENDED_DEBUG};
return $result;
} }
sub _next_calendar_date { sub _next_calendar_date {