From: Eric Wilde <ewilde@bsmdevelopment.com>
Date: Mon, 12 Nov 2018 11:07:58 +0000 (+1300)
Subject: Minor re-arrangement to make output consistent
X-Git-Tag: 1.0.0~64
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a66b95cbd2b538f816e309aaa5a9c575e84a941c;p=mythtv-status.git

Minor re-arrangement to make output consistent
---

diff --git a/bin/mythtv-status b/bin/mythtv-status
index e916e36..6635b24 100755
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -173,11 +173,12 @@ my %defaults = (
   'schedule' => {
     'attrs' => [ qw/title startTime NODE_TEXT subTitle channelName:.\/Channel[@channelName] chanNum:.\/Channel[@chanId] inputId:.\/Channel[@inputId]/ ],
     'template' => "__startTime__"
-      . ($c->{'encoder_details'} ? " - Enc: __inputId__, Chan: __chanNum__" : '')
       . " - __title__"
       . ($c->{'episode'} ? " - __subTitle__" : '')
       . " (__channelName__)"
+      . ($c->{'encoder_details'} ? " - Enc: __inputId__, Chan: __chanNum__" : '')
       . ($c->{'description'} ? "\n__NODE_TEXT__" : ''),
+
     'filter' =>  {
 
       # Only show recordings for today and tomorrow.
@@ -314,9 +315,9 @@ my @blocks = (
     'attrs' => [ qw/title endTime channelName:.\/Channel[@channelName]
     		    encoderId:.\/Recording[@encoderId]
 		    chanNum:.\/Channel[@chanNum]/ ],
-    'template' => "__title__ (__channelName__"
-      . ($c->{'encoder_details'} ? ", Enc: __encoderId__, Chan: __chanNum__" : '')
-      . ") Ends: __endTime__",
+    'template' => "__title__ (__channelName__) "
+      . ($c->{'encoder_details'} ? ", Enc: __encoderId__, Chan: __chanNum__ " : '')
+      . "Ends: __endTime__",
     'rewrite' => {
       '&endTime' => sub {
         my ($value, $vars) = @_;