Print birthdays/anniversaries, and better format diary lines.
This commit is contained in:
parent
98774290b1
commit
df202085ef
1 changed files with 21 additions and 9 deletions
|
@ -43,7 +43,10 @@ my $firstDay = 1;
|
||||||
my $firstTime = 1;
|
my $firstTime = 1;
|
||||||
my $dayLine = "";
|
my $dayLine = "";
|
||||||
my $prettyDayLine;
|
my $prettyDayLine;
|
||||||
|
|
||||||
while (my $line = <THREE_DAYS>) {
|
while (my $line = <THREE_DAYS>) {
|
||||||
|
my $thisLinePrintable;
|
||||||
|
|
||||||
chomp $line;
|
chomp $line;
|
||||||
if ($line =~ /^\S/) {
|
if ($line =~ /^\S/) {
|
||||||
$firstDay = $firstTime;
|
$firstDay = $firstTime;
|
||||||
|
@ -52,31 +55,40 @@ while (my $line = <THREE_DAYS>) {
|
||||||
$dayLine =~ s/\s*W\d+\s*$//;
|
$dayLine =~ s/\s*W\d+\s*$//;
|
||||||
$prettyDayLine = "\${color3}$dayLine\${color}\n";
|
$prettyDayLine = "\${color3}$dayLine\${color}\n";
|
||||||
}
|
}
|
||||||
elsif ($line =~ /^\s+(?:[^:]+)\s*:\s+(\d+)\s*:\s*(\d+)\s*[\-\.]+(.*)$/) {
|
elsif ($line =~ /^\s+([^:]+)\s*:\s+(\d+)\s*:\s*(\d+)\s*[\-\.]+(?:\s*(\d+)\s*:\s*(\d+))?(.*)$/) {
|
||||||
my $date = ParseDate("$dayLine $1:$2");
|
my($source, $startHour, $startMin, $endHour, $endMin, $rest) =
|
||||||
|
($1, $2, $3, $4, $5, $6);
|
||||||
|
my $start = "$startHour:$startMin";
|
||||||
|
my $end = "$endHour:$endMin";
|
||||||
|
my $date = ParseDate("$dayLine $start");
|
||||||
|
my $endDate = ParseDate("$dayLine $end");
|
||||||
|
$endDate = DateCalc($date, "+ 1 hour") unless defined $endDate;
|
||||||
|
$thisLinePrintable = " $start-$end $rest\${alignr 10}(from $source)"
|
||||||
|
unless $endDate lt $now;
|
||||||
if ($firstDay) {
|
if ($firstDay) {
|
||||||
my $time = "$1:$2";
|
|
||||||
my $val = $3;
|
my $val = $3;
|
||||||
if (DateCalc("$date", "+ 15 minutes") ge $now and
|
if (DateCalc("$now", "+ 15 minutes") ge $date and $now le $date) {
|
||||||
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;
|
||||||
print $fh "You have an appointment at $time: $val\n";
|
print $fh "You have an appointment at $start: $rest\n";
|
||||||
$fh->close();
|
$fh->close();
|
||||||
system('/home/bkuhn/bin/myosd', $fname);
|
system('/home/bkuhn/bin/myosd', $fname);
|
||||||
system("/usr/bin/espeak", '-p', '45', '-s', '130', '-f', $fname)
|
system("/usr/bin/espeak", '-p', '45', '-s', '130', '-f', $fname)
|
||||||
unless -f "$ENV{HOME}/.silent-running";
|
unless -f "$ENV{HOME}/.silent-running";
|
||||||
system('/usr/bin/notify-send', '-u', 'critical', '-t', '300000',
|
system('/usr/bin/notify-send', '-u', 'critical', '-t', '300000',
|
||||||
'Appointment', "You have an appointment at $time: $val");
|
'Appointment', "You have an appointment at $start: $rest");
|
||||||
}
|
}
|
||||||
next if DateCalc("$date", "+ 1 hour") lt $now;
|
|
||||||
}
|
}
|
||||||
|
} elsif ($line =~ /^\s+(?:birthday|anniversary)\s*:\s+(\S.+)\s*$/i) {
|
||||||
|
$thisLinePrintable = " $1";
|
||||||
|
}
|
||||||
|
if (defined $thisLinePrintable) {
|
||||||
if (defined $prettyDayLine) {
|
if (defined $prettyDayLine) {
|
||||||
print $prettyDayLine;
|
print $prettyDayLine;
|
||||||
undef $prettyDayLine;
|
undef $prettyDayLine;
|
||||||
}
|
}
|
||||||
print "$line\n";
|
print $thisLinePrintable, "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
Loading…
Add table
Reference in a new issue