Changeset 130 for shepherd

Timestamp:

10/24/06 05:06:59 (7 years ago)

Author:

lincoln

Message:

--status bling, more concise descriptions of all plugins, re-add .conf file back (optional) for postprocessors/reconcilers

Files:

• shepherd (modified) (4 diffs)

shepherd

@@ -3 +3 @@
 # "Shepherd"
 
-my $version = '0.2.22';
+my $version = '0.2.23';
 
 # A wrapper for various Aussie TV guide data grabbers
@@ -895 +895 @@
         $seen_channels_with_data, $this_plugin->{programmes},
         int($this_plugin->{total_duration} / 3600),
-        (defined $this_plugin->{earliest_data_seen} ? (strftime "%a%d%b%H:%M", localtime($this_plugin->{earliest_data_seen})) : 'no'),
-        (defined $this_plugin->{latest_data_seen} ? (strftime "%a%d%b%H:%M", localtime($this_plugin->{latest_data_seen})) : 'data');
+        (defined $this_plugin->{earliest_data_seen} ? (strftime "%a%d%b%Hh", localtime($this_plugin->{earliest_data_seen})) : 'no'),
+        (defined $this_plugin->{latest_data_seen} ? (strftime "%a%d%b%Hh", localtime($this_plugin->{latest_data_seen})) : 'data');
 
     $plugin_data->{$plugin} = $this_plugin;
@@ -1402 +1402 @@
     return unless (fetch_file($rfile, $newfile));
 
-    if ($progtype eq "grabber") {    
-        # Fetch grabber config file
-        $rfile .= ".conf";
-        $config = fetch_file($rfile);
-        return unless ($config);
-
+    # Fetch grabber config file
+    $rfile .= ".conf";
+    $config = fetch_file($rfile);
+
+    if (!$config) {
+        return if ($progtype eq "grabber"); # grabbers MUST have config files
+    } else {
         eval $config;
     }
@@ -1922 +1923 @@
 }
 
+sub pretty_print
+{
+    my ($p, $len) = @_;
+    my $spaces = ' ' x (79-$len);
+    my $ret = "";
+
+    while (length($p) > 0) {
+        if (length($p) <= $len) {
+            $ret .= $p;
+            $p = "";
+        } else {
+            # find a space to the left of cutoff
+            my $len2 = $len;
+            while ((substr($p,$len2,1) ne ' ') && ($len2 > 0)) {
+                $len2--;
+            }
+            if ($len2 == 0) {
+                # no space - just print it with cutoff
+                $ret .= substr($p,0,$len);
+                $p = substr($p,$len,(length($p)-$len));
+            } else {
+                # print up to space
+                $ret .= substr($p,0,$len2);
+                $p = substr($p,($len2+1),(length($p)-$len2+1));
+            }
+            # print whitespace
+            $ret .= "\n".$spaces;
+        }
+    }
+    return $ret;
+}
+
 sub status
 {
-    my %qual_table = ( 3 => "Best", 2 => "Good", 1 => "Unkn" );
-
     print "\nThe following plugins are known:\n",
-          " Type     Name             Description\n".
-          " -------- ---------------- ------------------------------------------------------\n";
+          " Type     Name           Version Description\n".
+          " -------- -------------- ------- ----------------------------------------------\n";
+
     foreach (sort { $components->{$a}->{type} cmp $components->{$b}->{type} } keys %{$components}) {
-        printf " %-8s %-16s %54s\n",
+        printf " %-8s %-15s%7s %46s\n",
           substr($components->{$_}->{type},0,8), 
-          length($_) > 14 ? substr($_,0,14).".." : $_,
+          length($_) > 15 ? substr($_,0,13).".." : $_,
+          ($components->{$_}->{ver} ? substr($components->{$_}->{ver},0,7) : "unknown"),
           (defined $components->{$_}->{config}->{desc} ?
-            (length($components->{$_}->{config}->{desc}) > 52 ?
-              substr($components->{$_}->{config}->{desc},0,52).".." : $components->{$_}->{config}->{desc}) : "");
+            pretty_print($components->{$_}->{config}->{desc},46) : "");
     }
     printf "\n";
 
     print "Grabbers, listed in order of quality:\n".
-          " Qual Grabber           Version Enabled Ready Last Run   Status\n" .
-          " ---- ----------------- ------- ------- ----- ---------- ----------------------------\n";
+          "                   Enabled/\n".
+          " Grabber        Qual Ready Last Run   Status\n" .
+          " -------------- ---- ----- ---------- -----------------------------------------\n";
+    my %qual_table = ( 3 => "Best", 2 => "Good", 1 => "Avg" );
     foreach (sort { $components->{$b}->{config}->{quality} <=> $components->{$a}->{config}->{quality} } query_grabbers()) {
         my $h = $components->{$_};
-        printf  " %-4s %-16s %8s %4s %6s  %11s %s\n",
+        printf  " %-15s%-4s  %1s/%1s %11s %s\n",
+          length($_) > 15 ? substr($_,0,13).".." : $_,
           $qual_table{($h->{config}->{quality})},
-          length($_) > 14 ? substr($_,0,14).".." : $_,
-          ($h->{ver} ? substr($h->{ver},0,8) : "unknown"),
-          $h->{disabled} ? '' : 'Y',
-          $h->{ready} ? 'Y' : '',
+          $h->{disabled} ? 'N' : 'Y',
+          $h->{ready} ? 'Y' : 'N',
           $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : 'never',
-          $h->{laststatus} ? $h->{laststatus} : '';
+          $h->{laststatus} ? pretty_print($h->{laststatus},41) : '';
     }
 
     print "\n".
-          " Reconciler        Version Enabled Ready Last Run   Status\n" .
-          " ---------------- -------- ------- ----- ---------- ---------------------------\n";
+          "              Enabled/\n".
+          " Reconciler     Ready Last Run   Status\n" .
+          " -------------- ----- ---------- ----------------------------------------------\n";
     foreach (sort { $components->{$a} <=> $components->{$b} } query_reconcilers()) {
         my $h = $components->{$_};
-        printf  " %-16s %8s %4s %6s  %11s %s\n",
-                length($_) > 14 ? substr($_,0,14).".." : $_,,
-                ($h->{ver} ? $h->{ver} : "unknown"),
-                $h->{disabled} ? '' : 'Y',
-                $h->{ready} ? 'Y' : '',
-                $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : 'never',
-                $h->{laststatus} ? $h->{laststatus} : '';
+        printf  " %-15s %1s/%1s %11s %s\n",
+          length($_) > 15 ? substr($_,0,13).".." : $_,
+          $h->{disabled} ? 'N' : 'Y',
+          $h->{ready} ? 'Y' : 'N',
+          $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : 'never',
+          $h->{laststatus} ? pretty_print($h->{laststatus},46) : '';
     }
 
     print "\n".
-          " Postprocessor     Version Enabled Ready Last Run   Status\n" .
-          " ---------------- -------- ------- ----- ---------- ---------------------------\n";
+          "              Enabled/\n".
+          " Postprocessor  Ready Last Run   Status\n" .
+          " -------------- ----- ---------- ----------------------------------------------\n";
     foreach (sort { $components->{$a} <=> $components->{$b} } query_postprocessors()) {
         my $h = $components->{$_};
-        printf  " %-16s %8s %4s %6s  %11s %s\n",
-                length($_) > 14 ? substr($_,0,14).".." : $_,
-                ($h->{ver} ? $h->{ver} : "unknown"),
-                $h->{disabled} ? '' : 'Y',
-                $h->{ready} ? 'Y' : '',
-                $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : 'never',
-                $h->{laststatus} ? $h->{laststatus} : '';
+        printf  " %-15s %1s/%1s %11s %s\n",
+          length($_) > 15 ? substr($_,0,13).".." : $_,
+          $h->{disabled} ? 'N' : 'Y',
+          $h->{ready} ? 'Y' : 'N',
+          $h->{lastdata} ? (strftime "%a%d%b%y", localtime($h->{lastdata})) : 'never',
+          $h->{laststatus} ? pretty_print($h->{laststatus},46) : '';
     }
     printf "\nPreferred titles from grabber '%s'\n",$pref_title_source if ($pref_title_source);