Ticket #3: mythweb.diskusage.diff

mythweb/themes/Default/recorded_programs.php

@@ -14 +14 @@
     // Print the main page header
         parent::print_header("MythWeb - Recorded Programs");
     // Print the page contents
-        global $All_Shows, $Total_Time;
+        global $All_Shows, $Total_Time, $Total_Used;
 ?>
 
 <script language="JavaScript" type="text/javascript">
@@ -204 +204 @@
 </table>
 <?php
     echo '<p align="right" style="padding-right: 75px">'
-        .t('$1 programs, using $2 ($3) out of $4.', t($GLOBALS['Total_Programs']),
-                                                    nice_filesize(disk_used),
+        .t('$1 programs, using $2 ($3) out of $4 ($5 free).', t($GLOBALS['Total_Programs']),
+                                                    nice_filesize($Total_Used),
                                                     nice_length($Total_Time),
-                                                    nice_filesize(disk_size))
+                                                    nice_filesize(disk_size),
+                                                    nice_filesize(disk_size - disk_used))
         .'</p>';
 
     // Print the main page footer

mythweb/recorded_programs.php

@@ -65 +65 @@
 
 // Parse the program list
     $recordings     = get_backend_rows('QUERY_RECORDINGS Delete');
+    $Total_Used     = 0;
     $Total_Time     = 0;
     $Total_Programs = 0;
     $All_Shows      = array();
@@ -81 +82 @@
         // Make sure this is a valid show
             if (!$show->chanid || $show->length < 1)
                 continue;
-        // Keep track of the total time
+        // Keep track of the total time and disk space used
             $Total_Time += $show->length;
+            $Total_Used += $show->filesize;
         // Skip programs the user doesn't want to look at, but keep track of their names and how many episodes we have recorded
             $Total_Programs++;
             $Program_Titles[$record[0]]++;

mythweb/languages/English.php

@@ -17 +17 @@
 // Shared Terms
     '$1 min'                                             => '',
     '$1 mins'                                            => '',
-    '$1 programs, using $2 ($3) out of $4.'              => '',
+    '$1 programs, using $2 ($3) out of $4 ($5 free).'    => '',
     '$1 to $2'                                           => '',
     'Advanced Options'                                   => '',
     'Airtime'                                            => '',
     'All recordings'                                     => '',
     'Auto-expire recordings'                             => '',
     'Auto-flag commercials'                              => '',
+    'Auto-transcode'                                     => '',
     'Backend Status'                                     => '',
     'Cancel this schedule.'                              => '',
     'Category'                                           => '',