From: Dean Pemberton Date: Thu, 31 Jul 2008 00:35:14 +0000 (+1200) Subject: Added formatting and colour to the HTML emails. X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d531519846adbff15dc44cb890741b49e567a46b;p=mythtv-status.git Added formatting and colour to the HTML emails. --- diff --git a/bin/mythtv-status b/bin/mythtv-status index 86479d7..db2aa07 100755 --- a/bin/mythtv-status +++ b/bin/mythtv-status @@ -103,18 +103,19 @@ if (defined $colour && scalar(@email) == 0) { $normal = "\033[0m"; } -my $safe_html = ''; -my $warning_html = ''; -my $normal_html = ''; if (defined $colour && scalar(@email) == 1) { - $safe_html = ''; - $warning_html = ''; - $normal_html = ''; + $safe = ''; + $warning = ''; + $normal = ''; } # Is a warning present? my $warn_present = 0; +# would be good to have these in the defaults structure. I'll try that later +my $oneliners_html_pre = ""; +my $oneliners_html_post = "
"; + # Allow setting some defaults for the output blocks. my %defaults = ( 'schedule' => { @@ -125,6 +126,12 @@ my %defaults = ( . (defined $episode ? " - __subTitle__" : '') . " (__channelName__)" . (defined $description ? "\n__NODE_TEXT__" : ''), + 'template_html' => "
  • __startTime__" + . (defined $encoder_details ? " - Enc: __inputId__, Chan: __chanNum__" : '') + . " - __title__" + . (defined $episode ? " - __subTitle__" : '') + . " (__channelName__)" + . (defined $description ? "\n__NODE_TEXT__" : ''), 'filter' => { # Only show recordings for today and tomorrow. @@ -151,6 +158,7 @@ my @blocks = ( # All the one liners together { 'name' => 'One Liners', + 'name_html' => 'One Liners', 'type' => 'sub', 'template' => '', 'template_html' => '', @@ -160,22 +168,26 @@ my @blocks = ( # Date/Time from server { 'name' => 'Status', + 'name_html' => 'Status', 'type' => 'xpath', 'xpath' => "//Status", 'attrs' => [ qw/time date/ ], 'template' => "__date__, __time__", - 'template_html' => "__date__, __time__
    ", + 'template_html' => "__date__, __time__", 'format' => 'one line' }, # Info about the encoders. { 'name' => 'Encoders', + 'name_html' => '

    Encoders

    ', 'type' => 'xpath', 'xpath' => "//Status/Encoders/Encoder", 'attrs' => [ qw/hostname id state connected/ ], 'template' => "__hostname__ (__id__) - __state____connected__", - 'template_html' => "__hostname__ (__id__) - __state____connected__
    ", + 'template_html' => "
  • __hostname__ (__id__) - __state____connected__", + 'template_html_pre' => "
      ", + 'template_html_post' => "
    ", 'rewrite' => { '/connected/' => { '1' => '', '0' => ' (Disconnected)' }, '/state/' => { @@ -190,12 +202,15 @@ my @blocks = ( # What programs (if any) are being recorded right now? { 'name' => 'Recording Now', + 'name_html' => '

    Recording Now

    ', 'type' => 'xpath', 'xpath' => "//Status/Encoders/Encoder/Program", 'hide' => 'after', 'attrs' => [ qw/title endTime channelName:.\/Channel[@channelName]/ ], 'template' => "__title__ (__channelName__) Ends: __endTime__", - 'template_html' => "__title__ (__channelName__) Ends: __endTime__
    ", + 'template_html' => "
  • __title__ (__channelName__) Ends: __endTime__", + 'template_html_pre' => "
      ", + 'template_html_post' => "
    ", 'rewrite' => { '/endTime/' => { '.*T' => '' }, }, @@ -207,10 +222,13 @@ my @blocks = ( # The upcoming recordings. { 'name' => 'Scheduled Recordings', + 'name_html' => '

    Scheduled Recordings

    ', 'type' => 'xpath', 'xpath' => '//Status/Scheduled/Program', 'defaults' => 'schedule', 'template_html' =>'', + 'template_html_pre' => "
      ", + 'template_html_post' => "
    ", 'hide' => 'after', 'subs' => { 'find_next' => sub { @@ -246,13 +264,14 @@ my @blocks = ( # Diskspace, before storage groups { 'name' => 'Total Disk Space', + 'name_html' => 'Total Disk Space', 'type' => 'xpath', 'xpath' => '//Status/MachineInfo/Storage', 'protocol_version' => [ "<= 31" ], 'attrs' => [ qw/_total_total _total_used/ ], 'commify' => [ qw/_total_total _total_used/ ], 'template' => "Total space is ___total_total__ MB, with ___total_used__ MB used (__percent__)", - 'template_html' => "Total space is ___total_total__ MB, with ___total_used__ MB used (__percent__)
    ", + 'template_html' => "Total space is ___total_total__ MB, with ___total_used__ MB used (__percent__)", 'format' => 'one line', 'optional' => 1, 'subs' => { @@ -265,6 +284,7 @@ my @blocks = ( # Diskspace, with storage groups { 'name' => 'Total Disk Space', + 'name_html' => 'Total Disk Space', 'type' => 'xpath', 'xpath' => '//Status/MachineInfo/Storage', 'protocol_version' => [ ">= 32" ], @@ -272,7 +292,7 @@ my @blocks = ( 'attrs' => [ qw/drive_total_total drive_total_used/ ], 'commify' => [ qw/drive_total_total drive_total_used/ ], 'template' => "Total space is __drive_total_total__ MB, with __drive_total_used__ MB used (__percent__)", - 'template_html' => "Total space is __drive_total_total__ MB, with __drive_total_used__ MB used (__percent__)
    ", + 'template_html' => "Total space is __drive_total_total__ MB, with __drive_total_used__ MB used (__percent__)", 'format' => 'one line', 'optional' => 1, 'subs' => { @@ -285,13 +305,14 @@ my @blocks = ( # Diskspace, with storage groups and sensible XML layout. { 'name' => 'Total Disk Space', + 'name_html' => 'Total Disk Space', 'type' => 'xpath', 'xpath' => '//Status/MachineInfo/Storage/Group[@id="total"]', 'protocol_version' => [ ">= 39" ], 'attrs' => [ qw/total used/ ], 'commify' => [ qw/total used/ ], 'template' => "Total space is __total__ MB, with __used__ MB used (__percent__)", - 'template_html' => "Total space is __total__ MB, with __used__ MB used (__percent__)
    ", + 'template_html' => "Total space is __total__ MB, with __used__ MB used (__percent__)", 'format' => 'one line', 'optional' => 1, 'subs' => { @@ -304,13 +325,14 @@ my @blocks = ( # Diskspace, with storage groups and sensible XML layout. { 'name' => 'Disk Space', + 'name_html' => 'Total Disk Space', 'type' => 'xpath', 'xpath' => '//Status/MachineInfo/Storage/Group', 'protocol_version' => [ ">= 39" ], 'attrs' => [ qw/id total used/ ], 'commify' => [ qw/total used/ ], 'template' => "Total space for group __id__ is __total__ MB, with __used__ MB used (__percent__)", - 'template_html' => "Total space for group __id__ is __total__ MB, with __used__ MB used (__percent__)
    ", + 'template_html' => "Total space for group __id__ is __total__ MB, with __used__ MB used (__percent__)", 'filter' => { 'id' => sub { return $_[0] eq 'total' }, 'used' => sub { @@ -329,10 +351,11 @@ my @blocks = ( # How many hours till the next recording. { 'name' => 'Next Recording In', + 'name_html' => 'Next Recording In', 'type' => 'sub', 'format' => 'one line', 'template' => '__next_time__', - 'template_html' => '__next_time__
    ', + 'template_html' => '__next_time__', 'rewrite' => { '&next_time' => sub { return $next_time @@ -359,18 +382,20 @@ my @blocks = ( }, 'sub' => sub { my ($str, $str_html) = substitute_vars($_[0], { 'next_time' => $next_time }); - return ($str); + return ($str,$str_html); } }, # Check how much Guide data we have { 'name' => 'Guide Data', + 'name_html' => 'Guide Data', 'format' => 'one line', 'type' => 'xpath', 'xpath' => '//Status/MachineInfo/Guide[@guideDays]', 'attrs' => [qw/guideDays status guideThru/], 'template' => 'There is __guideDays__ days worth of data, through to __guideThru__', + 'template_html' => 'There is __guideDays__ days worth of data, through to __guideThru__', 'filter' => { 'guideDays' => sub { if ($_[0] > $guide_days_warn) { @@ -441,8 +466,6 @@ my $output = "$title\n"; my $html = "$title_html\n"; $output .= '=' x length($title) . "\n"; -$html .= "

    " . '=' x length($title_html) . "


    \n"; - for my $block (@blocks) { $block->{'format'} ||= 'multi line'; $block->{'optional'} ||= 0; @@ -500,9 +523,9 @@ for my $block (@blocks) { if (defined $result_html && $result_html ne '' && ! defined $hide) { $exit_value ||= $warn_present; if ($block->{'format'} eq 'one line') { - push @oneliners_html, [ $block->{'name'}, $result_html ]; + push @oneliners_html, [ $block->{'name_html'}, $result_html ]; } else { - $html .= "$block->{'name'}:\n"; + $html .= "$block->{'name_html'}\n"; $html .= $result_html . "\n\n"; } } @@ -543,13 +566,14 @@ if (scalar(@oneliners_html) > 0) { # Put the one liners together, with leading dots to the colon. my $oneliners_html = ""; + $oneliners_html .= $oneliners_html_pre; for $line (@oneliners_html) { - $oneliners_html .= "$line->[0]" - . ('.' x ($length - length($line->[0]))) . ": $line->[1]\n"; + $oneliners_html .= "$line->[0] $line->[1]\n"; } + $oneliners_html .= $oneliners_html_post; # What a hacky way of putting the one liners where I want them... - $html =~ s/^One Liners:\nPlace holder\n/$oneliners_html/m; + $html =~ s/^One Liners\nPlace holder\n/$oneliners_html/m; } # Either print the status out, or email it. @@ -591,8 +615,7 @@ if ($return_code_only) { $mail->send('sendmail'); - # $mail->dump_skeleton(); - # print $mail->as_string; + # print $mail->as_string; } } @@ -729,6 +752,9 @@ sub process_xml { my @lines; my @lines_html; + + if (defined $block->{'template_html_pre'}) {push @lines_html, $block->{'template_html_pre'};} + for my $item (@{ $items }) { my %vars; for my $key (@{ $block->{'attrs'} }) { @@ -750,6 +776,8 @@ sub process_xml { } + if (defined $block->{'template_html_post'}) {push @lines_html, $block->{'template_html_post'};} + return ( join("\n", @lines) , join("\n", @lines_html) ); }