A few minor tweaks to the logic for generating HTML messages.

diff --git a/bin/mythtv-status b/bin/mythtv-status
index db2aa07d6b7d9dbd431802b6b59bbe69a33a0a99..bf91e8c119792969713d285b2d800a136e640f4f 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -158,7 +158,6 @@ my @blocks = (
   # All the one liners together
   {
     'name' => 'One Liners',
-    'name_html' => 'One Liners',
     'type' => 'sub',
     'template' => '',
     'template_html' => '',
@@ -168,7 +167,6 @@ my @blocks = (
   # Date/Time from server
   {
     'name'  => 'Status',
-    'name_html'  => '<tr><td><b>Status</b>',
     'type'  => 'xpath',
     'xpath' => "//Status",
     'attrs' => [ qw/time date/ ],
@@ -180,7 +178,6 @@ my @blocks = (
   # Info about the encoders.
   {
     'name'  => 'Encoders',
-    'name_html'  => '<h2>Encoders</h2>',
     'type'  => 'xpath',
     'xpath' => "//Status/Encoders/Encoder",
     'attrs' => [ qw/hostname id state connected/ ],
@@ -202,7 +199,6 @@ my @blocks = (
   # What programs (if any) are being recorded right now?
   {
     'name'  => 'Recording Now',
-    'name_html'  => '<h2>Recording Now</h2>',
     'type'  => 'xpath',
     'xpath' => "//Status/Encoders/Encoder/Program",
     'hide'  => 'after',
@@ -222,7 +218,6 @@ my @blocks = (
   # The upcoming recordings.
   {
     'name'  => 'Scheduled Recordings',
-    'name_html'  => '<h2>Scheduled Recordings</h2>',
     'type'  => 'xpath',
     'xpath' => '//Status/Scheduled/Program',
     'defaults' => 'schedule',
@@ -264,7 +259,6 @@ my @blocks = (
   # Diskspace, before storage groups
   {
     'name' => 'Total Disk Space',
-    'name_html' => '<tr><td><b>Total Disk Space</b>',
     'type' => 'xpath',
     'xpath' => '//Status/MachineInfo/Storage',
     'protocol_version' => [ "<= 31" ],
@@ -284,7 +278,6 @@ my @blocks = (
   # Diskspace, with storage groups
   {
     'name' => 'Total Disk Space',
-    'name_html' => '<tr><td><b>Total Disk Space</b>',
     'type' => 'xpath',
     'xpath' => '//Status/MachineInfo/Storage',
     'protocol_version' => [ ">= 32" ],
@@ -305,7 +298,6 @@ my @blocks = (
   # Diskspace, with storage groups and sensible XML layout.
   {
     'name' => 'Total Disk Space',
-    'name_html' => '<tr><td><b>Total Disk Space</b>',
     'type' => 'xpath',
     'xpath' => '//Status/MachineInfo/Storage/Group[@id="total"]',
     'protocol_version' => [ ">= 39" ],
@@ -325,7 +317,6 @@ my @blocks = (
   # Diskspace, with storage groups and sensible XML layout.
   {
     'name' => 'Disk Space',
-    'name_html' => '<tr><td><b>Total Disk Space</b>',
     'type' => 'xpath',
     'xpath' => '//Status/MachineInfo/Storage/Group',
     'protocol_version' => [ ">= 39" ],
@@ -351,7 +342,6 @@ my @blocks = (
   # How many hours till the next recording.
   {
     'name' => 'Next Recording In',
-    'name_html' => '<tr><td><b>Next Recording In</b>',
     'type' => 'sub',
     'format' => 'one line',
     'template' => '__next_time__',
@@ -389,7 +379,6 @@ my @blocks = (
   # Check how much Guide data we have
   {
     'name'     => 'Guide Data',
-    'name_html'     => '<tr><td><b>Guide Data</b>',
     'format'   => 'one line',
     'type'     => 'xpath',
     'xpath'    => '//Status/MachineInfo/Guide[@guideDays]',
@@ -461,9 +450,8 @@ my %version;
 
 my $exit_value = 0;
 my $title =  "MythTV status for $host";
-my $title_html =  "<h1>MythTV status for $host</h1><br>";
 my $output = "$title\n";
-my $html = "$title_html\n";
+my $html = "<h1>$title</h1>\n";
 $output .= '=' x length($title) . "\n";
 
 for my $block (@blocks) {
@@ -523,9 +511,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_html'}, $result_html ];
+      push @oneliners_html, [ "<tr><th>$block->{'name'}</th>", $result_html ];
     } else {
-      $html .= "$block->{'name_html'}\n";
+      $html .= "<h2>$block->{'name'}</h2>\n";
       $html .= $result_html . "\n\n";
     }
   }
@@ -573,7 +561,7 @@ if (scalar(@oneliners_html) > 0) {
   $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/^Place holder$/$oneliners_html/m;
 }
 
 # Either print the status out, or email it.
@@ -888,7 +876,7 @@ sub substitute_vars {
     if defined $block->{'commify'};
 
   my $template = $block->{'template'};
-  my $template_html = defined $block->{'template_html'} ?  $block->{'template_html'} : undef ;
+  my $template_html = $block->{'template_html'} || $block->{'template'};
   my $skip = undef;
   my ($key, $value);
   while (($key, $value) = (each %{ $vars })) {
@@ -940,6 +928,8 @@ sub substitute_vars {
 
     $template =~ s/__${name}__/$value/g
       if defined $value;
+    $template_html =~ s/__${name}__/$value/g
+      if defined $value;
   }
 
   return (defined $skip ? undef : $template, $template_html );