Changeset 118

Timestamp:

10/21/06 22:02:08 (7 years ago)

Author:

lincoln

Message:

make set_order smarter with random ordering within quality groups

Files:

• shepherd (modified) (7 diffs)
• status (modified) (1 diff)

shepherd

@@ -3 +3 @@
 # "Shepherd"
 
-my $version = '0.2.19';
+my $version = '0.2.20';
 
 # A wrapper for various Aussie TV guide data grabbers
@@ -1530 +1530 @@
 }
 
+# set_order is used to set the order of datafiles that we present to the reconciler.
+# typically we want at least one 'preferred' datasource in order to keep programme
+# titles consistent even if we are switching grabbers all the time.
+# for any grabbers not explicitly listed, we randomly order them while
+# taking into account the 'quality' of the data they offer
+
 sub set_order
 {
@@ -1540 +1546 @@
     }
 
-    # and now set order
+    # and now set order by whatever we have been instructed
     my $order_num = 1;
     if ($pref_order) {
@@ -1552 +1558 @@
 
     # set order of any grabbers not specified in a random manner
+    # set randomly while obeying data 'quality' field - so we always put higher quality
+    # grabbers before lower-quality ones
     foreach my $proggy (query_grabbers()) {
         if ((!defined $components->{$proggy}->{order}) || ($components->{$proggy}->{order} == 0)) {
-            $components->{$proggy}->{order} = $order_num+int(rand(1000));
+            my $dq = query_config($proggy, 'quality');  # quality is a value 1-3.  higher=better
+            $components->{$proggy}->{order} = $order_num+((4-$dq)*1000)+int(rand(1000));
         }
     }
@@ -1590 +1599 @@
 sub query_grabbers
 {
-    return query_component_type('grabber');
+    my ($conf, $val) = @_;
+    return query_component_type('grabber',$conf,$val);
 }
 
@@ -1605 +1615 @@
 sub query_component_type
 {
-    my $progtype = shift;
+    my ($progtype,$conf,$val) = @_;
 
     my @ret = ();
     foreach (keys %$components)
     {
-        push (@ret, $_) if ($components->{$_}->{type} eq $progtype);
+        if ($components->{$_}->{type} eq $progtype) {
+            if (defined $conf) {
+                push (@ret, $_) if (query_config($_,$conf) eq $val);
+            } else {
+                push (@ret, $_);
+            }
+        }
     }
     return @ret;
@@ -1872 +1888 @@
           "Were you using one of the following data sources previously?\n".
           "If so, list it (or them) in order of preference.\n\n".
-          "Choose from: ";
-    print join(", ",query_grabbers());
+          "Choose from:\n";
+    printf " %s (100%% accurate or very close to it)\n",
+        join(", ",query_grabbers('quality',3));
+    printf " %s (occasionally or sometimes inaccurate)\n",
+        join(", ",query_grabbers('quality',2));
+    printf " %s (often inaccurate)\n",
+        join(", ",query_grabbers('quality',1));
+
     print "\nProvide a comma-seperated list (in preference order) or leave blank\n".
           "if you have no order preference.\n";

status

@@ -1 @@
-shepherd:0.2.19:shepherd
+shepherd:0.2.20:shepherd
 grabber:rex:3.3.5
 grabber:oztivo:0.8