proxmox-mirrors/pve-common
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-common synced 2025-08-15 00:31:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CalendarEvent: add 'utc' flag to calendar specs

Browse Source 
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
This commit is contained in:
Wolfgang Bumiller 2018-10-31 10:54:17 +01:00 committed by Thomas Lamprecht
parent 1457ffefbe
commit 0b7ba0445c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/PVE/CalendarEvent.pm
View File

@ -108,6 +108,9 @@ sub parse_calendar_event {
}; };
my @parts = split(/\s+/, $event); my @parts = split(/\s+/, $event);
my $utc = (@parts && uc($parts[-1]) eq 'UTC');
pop @parts if $utc;
if ($parts[0] =~ m/$dowsel/i) { if ($parts[0] =~ m/$dowsel/i) {
my $dow_spec = shift @parts; my $dow_spec = shift @parts;
@ -158,7 +161,7 @@ sub parse_calendar_event {
$m = [ sort { $a <=> $b } keys %$minutes_hash ]; $m = [ sort { $a <=> $b } keys %$minutes_hash ];
} }
return { h => $h, m => $m, dow => [ sort keys %$dow_hash ]}; return { h => $h, m => $m, dow => [ sort keys %$dow_hash ], utc => $utc };
} }
sub is_leap_year($) { sub is_leap_year($) {
@ -227,11 +230,12 @@ sub time_add_days($$) {
} }
sub compute_next_event { sub compute_next_event {
my ($calspec, $last, $utc) = @_; my ($calspec, $last) = @_;
my $hspec = $calspec->{h}; my $hspec = $calspec->{h};
my $mspec = $calspec->{m}; my $mspec = $calspec->{m};
my $dowspec = $calspec->{dow}; my $dowspec = $calspec->{dow};
my $utc = $calspec->{utc};
$last += 60; # at least one minute later $last += 60; # at least one minute later