Changeset 29

Timestamp:

10/05/06 20:20:11 (7 years ago)

Author:

max

Message:

Choose grabber order more intelligently (added structure; in practice
it's still random for the moment)

Files:

• shepherd (modified) (7 diffs)

shepherd

@@ -59 +59 @@
 
 my $timeslot_size = (15 * 60);                  # 15 minute slots
-my $channel_ok_threshold_percent = 90;          # 90% these may need to be tweaked but look ok for now
-my $postprocessor_ok_threshold_percent = 80;    # 80% these may need to be tweaked but look ok for now
-my $postprocessor_disable_failure_threshold = 5; # number of times a postprocessor has to fail in a row before it is automatically disabled
+my $channel_ok_threshold_percent = 90;          # 90% these may need to be 
+                                                # tweaked but look ok for now
+my $postprocessor_ok_threshold_percent = 80;    # 80% these may need to be 
+                                                # tweaked but look ok for now
+my $postprocessor_disable_failure_threshold = 5;# number of times a 
+                                                # postprocessor has to fail 
+                                                # in a row before it is 
+                                                # automatically disabled
 
 my $opt;
@@ -69 +74 @@
 my $debug = 1;
 my $grabbers = { };
-my $postprocessors = { };
+my $gscore;
 my $preferred; # obsolete but may still exist in shepherd.conf
 my $region;
@@ -78 +83 @@
 
 # postprocessing
+my $postprocessors = { };
 my $langs = [ 'en' ];
 my $num_timeslots;
@@ -130 +136 @@
 }
 
-&set_order(0,$opt->{setorder}) if ($opt->{setorder});
-&check() if ($opt->{check});
-
-if ($opt->{enable} or $opt->{disable} or $opt->{setorder} or $opt->{check} or $opt->{mirror})
+if ($opt->{setorder})
+{
+    set_order(0, $opt->{setorder}); 
+}
+
+if ($opt->{check})
+{
+    check();
+}
+
+if ($opt->{enable} or
+    $opt->{disable} or
+    $opt->{setorder} or
+    $opt->{check} or
+    $opt->{mirror})
 {
     set_order(1) if $made_changes;
@@ -187 +204 @@
     my $need_more_data = 1;
 
-    printf "\nGrabber stage:\n";
-
-    # iterate across grabbers until we have all our data we want (or need)
-    foreach my $grabber (sort { $grabbers->{$a}->{order} <=> $grabbers->{$b}->{order} } keys %$grabbers) {
-        next if ($grabbers->{$grabber}->{disabled});
+    print "\nGrabber stage:\n";
+
+    my $grabber;
+    
+    while ($grabber = choose_grabber())
+    {
         $used_grabbers++;
 
@@ -197 +215 @@
         $grabbers->{$grabber}->{laststatus} = "unknown";
 
-        printf "\nSHEPHERD: Using grabber: (%d) %s\n",$grabbers->{$grabber}->{order},$grabber;
+        printf "\nSHEPHERD: Using grabber: (%d) %s\n", $used_grabbers, $grabber;
 
         my $output = "$GRABBER_DIR/$grabber/output.xmltv";
@@ -243 +261 @@
         return;
     }
+}
+
+sub choose_grabber
+{
+    unless (defined $gscore)
+    {
+        foreach (keys %$grabbers)
+        {
+            unless ($grabbers->{$_}->{disabled})
+            {
+                $gscore->{$_} = 0;
+            }
+        }
+    }
+
+    my $total = score_grabbers();
+
+    print "Scoring unused valid grabbers:\n" . Dumper($gscore);
+
+    return undef unless (scalar keys %$gscore);
+
+    my $r = int(rand($total));
+#    print "Total score: $total.\nRand: $r.\n";
+
+    my $c = 0;
+    foreach (keys %$gscore)
+    {
+        if ($r >= $c and $r < ($c + $gscore->{$_}))
+        {
+            delete $gscore->{$_};
+            return $_;
+        }
+        $c += $gscore->{$_};
+    }
+    die "ERROR: failed to choose grabber.";
+}
+
+sub score_grabbers
+{
+    my ($score, $total);
+    foreach (keys %$gscore)
+    {
+        $score = 10;
+        $gscore->{$_} = $score;
+        $total += $score;
+    }
+    return $total;
 }