If the next scheduled recording is in more than 1 day, then use days.

diff --git a/ChangeLog b/ChangeLog
index 67ebe1ba21cfda90e7f41d87908c1a25ca6cdc0e..45f09ad04db272bb7d401297c94f7fa1b166b4d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
        If the next recording is in $x Hours, 0 Minutes, remove the comma
        as well, previously it was outputing "$x Hours,".
 
+       If the next recording is in more than 1 day, then switch to showing
+       it in days and hours, for example "1 Day, 2 Hours".
+
 2012-07-06     Andrew Ruthven
        Correctly handle UTF-8 in the output from MythTV.
 

diff --git a/bin/mythtv-status b/bin/mythtv-status
index 17e685757d9dbea25f041446c3e12c76f7356d53..df4ef89ba7a218a1d24a62d1d407da4782ebba45 100755 (executable)
--- a/bin/mythtv-status
+++ b/bin/mythtv-status
@@ -440,12 +440,20 @@ my @blocks = (
 
         my $err;
         my $delta   = DateCalc('now', $next_time, \$err, 0);
-        my $str     = Delta_Format($delta, 0, '%hh Hours, %mv Minutes');
         my $seconds = Delta_Format($delta, 'approx', 0, '%sh');
 
-        $str =~ s/\b1 (Hour|Minute)s/1 $1/g;
-        $str =~ s/^0 Hours, //;
-        $str =~ s/, 0 Minutes//;
+       # If the next recording is more than 1 day in the future,
+       # print out the days and hours.
+       my $str;
+       if ($seconds > 24 * 3600) {
+         $str = Delta_Format($delta, 0, '%dd Days, %hv Hours');
+       } else {
+         $str = Delta_Format($delta, 0, '%hh Hours, %mv Minutes');
+       }
+
+        $str =~ s/\b1 (Day|Hour|Minute)s/1 $1/g;
+        $str =~ s/(, )?0 Hours(, )?//;
+        $str =~ s/, 0 Minutes$//;
 
         if ($seconds <= $c->{'recording_in_warn'}) {
           $warn_present ||= 1;