From: Andrew Ruthven <andrew@etc.gen.nz>
Date: Mon, 21 Jan 2008 19:43:14 +0000 (+1300)
Subject: Add support for outputting the encoder details in recordings.
X-Git-Tag: 0.7.1~3
X-Git-Url: http://git.etc.gen.nz/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=101da053b356d247ad68971a9d5d2ee54c3978cf;p=mythtv-status.git

Add support for outputting the encoder details in recordings.

Thanks for Marc <drayson@net1plus.com> for the suggestion.
---

diff --git a/ChangeLog b/ChangeLog
index aac325c..3be8bc4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 	Change the version boundaries for the disk space blocks to reflect
 	current SVN.
 	The backend returns the disk usage in MB, not GB.
+	Optionally show the input ID and channel number for recordings.
 
 2007-01-20	Andrew Ruthven
 	Show the shows that will be deleted by the auto expirer, and their
diff --git a/THANKS b/THANKS
index 5de76f8..6757e2a 100644
--- a/THANKS
+++ b/THANKS
@@ -11,6 +11,8 @@ I'd like to thank the following people:
  - Brad MerManouelian & Glen Dragon - For sending me samples of multi-storage
    area XML so I could add the Diskspace block.
  - Ryan Steffes - For suggesting the Auto Expire block.
+ - Marc - For bug reports and suggesting outputting the encoder details for
+   recordings.
  - The Debian translators - Especially the Portuguese guys - you rock!
  - All the MythTV developers for working on a great bit of software
  
diff --git a/bin/mythtv-status b/bin/mythtv-status
index ac42000..921d0d7 100755
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -22,6 +22,7 @@ my $host = "localhost";
 my $port = "6544";
 my $description = undef;
 my $episode = undef;
+my $encoder_details = undef;
 my $colour = undef;
 my %display;
 my @email;
@@ -42,6 +43,7 @@ GetOptions(
   'c|colour|color' => \$colour,
   'd|descripton' => \$description,
   'e|episode'    => \$episode,
+  'encoder-details' => \$encoder_details,
   'h|host=s'     => \$host,
   'p|port=i'     => \$port,
   'v|version'    => \&print_version,
@@ -98,8 +100,10 @@ if (defined $colour && scalar(@email) == 0) {
 # Allow setting some defaults for the output blocks.
 my %defaults = (
   'schedule' => {
-    'attrs' => [ qw/title startTime NODE_TEXT subTitle channelName:.\/Channel[@channelName]/ ],
-    'template' => "__startTime__ - __title__"
+    'attrs' => [ qw/title startTime NODE_TEXT subTitle channelName:.\/Channel[@channelName] chanNum:.\/Channel[@chanId] inputId:.\/Channel[@inputId]/ ],
+    'template' => "__startTime__"
+      . (defined $encoder_details ? " - Enc: __inputId__, Chan: __chanNum__" : '')
+      . " - __title__"
       . (defined $episode ? " - __subTitle__" : '')
       . " (__channelName__)"
       . (defined $description ? "\n__NODE_TEXT__" : ''),
@@ -819,6 +823,10 @@ The threshold (in percent) of used disk space that we should show
 the disk space in red (if using colour) or send an email if we're
 in email mode with email only on warnings.
 
+=item B<--encoder-details>
+
+Display the input ID and channel name against the recording details.
+
 =item B<-e, --episode>
 
 Display the episode (subtitle) for the scheduled recordings.