Fix it so that items roll off and only notify 15 minutes.

This commit is contained in:
Bradley M. Kuhn 2013-08-24 22:05:53 -04:00
parent 691d77a646
commit 7f1c5618c5

View file

@ -49,14 +49,16 @@ while (my $line = <THREE_DAYS>) {
$firstDay = $firstTime; $firstDay = $firstTime;
$firstTime = 0; $firstTime = 0;
$dayLine = $line; $dayLine = $line;
$dayLine =~ s/\s*W\d+\s*$//;
$prettyDayLine = "\${color3}$dayLine\${color}\n"; $prettyDayLine = "\${color3}$dayLine\${color}\n";
} }
if ($line =~ /^\s+(?:[^:]+)\s*:\s+(\d+)\s*:\s*(\d+)\s*[\-\.]+(.*)$/) { elsif ($line =~ /^\s+(?:[^:]+)\s*:\s+(\d+)\s*:\s*(\d+)\s*[\-\.]+(.*)$/) {
my $date = ParseDate("$dayLine $1:$2");
if ($firstDay) { if ($firstDay) {
my $time = "$1:$2"; my $time = "$1:$2";
my $val = $3; my $val = $3;
my $date = ParseDate("$dayLine $1:$2"); if (DateCalc("$date", "+ 15 minutes") ge $now and
if (DateCalc("$date", "+ 15 minutes") ge $now) { DateCalc("$now", "+ 15 minutes") gt $date) {
my $fh = File::Temp->new(); my $fh = File::Temp->new();
$fh->unlink_on_destroy( 1 ); $fh->unlink_on_destroy( 1 );
my $fname = $fh->filename; my $fname = $fh->filename;
@ -69,6 +71,7 @@ while (my $line = <THREE_DAYS>) {
'Appointment', "You have an appointment at $time: $val"); 'Appointment', "You have an appointment at $time: $val");
} }
} }
next if DateCalc("$date", "+ 1 hour") lt $now;
if (defined $prettyDayLine) { if (defined $prettyDayLine) {
print $prettyDayLine; print $prettyDayLine;
undef $prettyDayLine; undef $prettyDayLine;