Changeset 1052

Timestamp:

05/17/08 22:36:03 (5 years ago)

Author:

max

Message:

shepherd: Three modes of grabber operation: Efficiency (default), Speed and Quality

Location:

trunk

Files:

• applications/shepherd (modified) (6 diffs)
• status (modified) (1 diff)

trunk/applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '1.3.2';
+my $version = '1.3.3';
 
 # tv_grab_au
@@ -65 +65 @@
 my $pref_title_source;
 my $want_paytv_channels;
-my $mirror_site;
+my $mirror_site;    # obsolete
 my $sources;
 my $debug = 0;
@@ -1822 +1822 @@
                         addsource=s
                         delsource=s
+                        mode=s
                      ));
   $debug = $opt->{debug};
@@ -3470 +3471 @@
 Session options:
     --output <s>          Create output file <s> (default: output.xmltv)
+    --mode <s>            Efficiency (default), Speed or Quality
+
     --noupdate            Don't update; just grab data
     --update              Update only; don't grab data
@@ -3539 +3542 @@
     my $used_grabbers = 0;
     &log("\nSHEPHERD: Grabber stage ($grab_policy).\n");
+    &log("SHEPHERD: " .
+         (($opt->{mode} and grep($_ eq lc($opt->{mode}), qw(quality speed))) ?
+             ucfirst(lc($opt->{mode})) : 'Efficiency') . 
+             " mode.\n");
 
     &analyze_plugin_data("",1,$progname);    
@@ -4066 +4073 @@
         }
 
-        my $dqbonus = 2 ** ($dq-1);
-
-        my $mult = $dq ** $catbonus;
+        my $mult;
+        if ($opt->{mode} and lc($opt->{mode}) eq 'quality')
+        {
+            $mult = ($dq ** $dq) * $catbonus / 2;
+        }
+        elsif ($opt->{mode} and lc($opt->{mode} eq 'speed'))
+        {
+            $mult = ($catbonus ** $catbonus) * $dq / 2;
+        }
+        else
+        {
+            $mult = $dq ** $catbonus;
+        }
 
         $mult *= 0.9 if (query_config($grabber, 'has_noncritical_gaps'));

trunk/status

@@ -1 @@
-application     shepherd            1.3.2
+application     shepherd            1.3.3
 reference       channel_list        18
 reference       Shepherd/Common.pm  0.35