Changeset 78

Timestamp:

10/16/06 19:39:16 (7 years ago)

Author:

max

Message:

Updated gconf-builder.

Files:

• util/gconf-builder (modified) (9 diffs)

util/gconf-builder

@@ -27 +27 @@
         "amounts of bandwidth. Category 2 grabbers are quite fast\n" .
         "and download relatively few files.\n\n";
-$config->{category} = ask("Which category is $grabber?");
+$config->{category} = ask_choice("Which category is $grabber?", 1, 1, 2);
 
 print   "\nCATEGORY: Channels Supported\n\n" .
@@ -41 +41 @@
 
 print   "\nCATEGORY: Days Supported\n\n" .
-        "Enter how many days of data $grabber can retrieve. The current\n" .
-        "day is considered to be day 1.\n\n";
+        "Enter how many days of data $grabber can retrieve.\n\n";
 
 $config->{max_days} = ask("Days supported? [default=7]");
@@ -49 +48 @@
 print   "\nSome grabbers aren't always able to retrieve the maximum number\n" .
         "of days, because sometimes the datasource isn't topped up. Enter\n" .
-        "the minimum number of days of data that $grabber can reliably fetch,\n" .
-        "where today is day 1.\n\n";
-
-$config->{min_days} = ask("Minimum days supported? [default=7]");
-$config->{min_days} ||= 7;
+        "the minimum number of days of data that $grabber can reliably fetch.\n\n";
+
+$config->{max_reliable_days} = ask("Days reliably supported? [default=7]");
+$config->{max_reliable_days} ||= 7;
+
+print   "\nCATEGORY: Regions Supported\n\n" .
+        "Enter the region IDs supported by $grabber. If $grabber supports\n" .
+        "all regions, just hit Enter. If it supports a limited number of regions,\n" .
+        "enter these separated by spaces (e.g. \"94 104 118\"). If it supports\n" .
+        "most but not all regions, enter a minus sign followed by a list of the\n" .
+        "unsupported regions (e.g. \"-112 114 128\").\n\n";
+
+$config->{regions} = ask("Regions supported?");
 
 print   "\nCATEGORY: Configuration Requirements\n\n" .
@@ -59 +66 @@
         "before it can run (such as registration on a remote web site).\n\n";
 
-$config->{config_reqd} = ask_boolean("Requires manual configuration? ");
-
-if ($config->{config_reqd})
-{
+if (ask_boolean("Requires manual configuration? "))
+{
+    $config->{config_reqd} = 1;
+        
     print   "\nShepherd needs a way of detecting whether $grabber has been\n" .
             "correctly configured or not. Please enter a command-line option\n" .
             "that will cause $grabber to exit with status 0 if it is configured\n" .
             "correctly, and exit with another status if it is not.\n\n";
-    $config->{option_ready} = ask("Command-line option for readiness? [default=--ready]");
-    $config->{option_ready} ||= '--ready';
+            $config->{option_ready} = ask("Command-line option for readiness? [default=--ready]");
+            $config->{option_ready} ||= '--ready';
 }
 else
@@ -78 +85 @@
     $config->{option_ready} = ask("Command-line option for compilation check? " .
             "[default=--version]");
-    $config->{option_read} ||= '--version';
-}
-
-print   "\nCATEGORY: Niceness\n\n" .
-        "NOTE: This metric will probably change, so don't sweat it for now.\n".
-        "Rate the niceness of $grabber. Niceness is a general score out\n" .
-        "of 10 for how quickly, efficiently, and, well, nicely, the\n" .
-        "grabber can retrieve data.\n\n";
-
-$config->{niceness} = ask("Niceness? [default=5]");
-$config->{niceness} ||= 5;
+    $config->{option_ready} ||= '--version';
+}
+
+print   "\nCATEGORY: Data Quality\n\n" .
+        "Rate the accuracy of the data $grabber fetches; i.e. how often it\n" .
+        "can be relied upon to report the right programs in the right timeslots.\n" .
+        "(This is a measure of the source $grabber relies upon rather than a\n".
+        "a judgement of $grabber itself.)\n" .
+        "(1) Guide data is often inaccurate\n" .
+        "(2) Guide data is occasionally or sometimes inaccurate\n" .
+        "(3) Guide data is 100% accurate, or very close to it\n\n";
+
+$config->{quality} = ask_choice("Data quality?", 3, 1, 2, 3);
+
+#print  "\nCATEGORY: Niceness\n\n" .
+#       "NOTE: This metric will probably change, so don't sweat it for now.\n".
+#       "Rate the niceness of $grabber. Niceness is a general score out\n" .
+#       "of 10 for how quickly, efficiently, and, well, nicely, the\n" .
+#       "grabber can retrieve data.\n\n";
+#
+#$config->{niceness} = ask("Niceness? [default=5]");
+#$config->{niceness} ||= 5;
 
 my $g = '';
@@ -96 +114 @@
         "as opposed to having to fetch all or nothing.\n\n";
 
-$s = ask_boolean("Can $grabber fetch a single day of data only? ");
+$s = ask_boolean("Can $grabber fetch a single day of data only? ", 1);
 
 if ($s)
@@ -109 +127 @@
     $config->{option_days} ||= '--days';
 
+    print   "\nDoes $grabber consider day 1 to be today? That is, if invoked\n".
+            "with the option \"" . $config->{option_days} . "1\", will $grabber\n" .
+            "fetch data for today? If you answer 'no', we will assume that $grabber\n" .
+            "considers tomorrow to be day 1.\n\n";
+    $config->{day_zero} = ask_boolean("Day 1 is today?", 1) ? 0 : 1;
+
     print   "\nWhat option needs to be sent to $grabber to specify the\n" .
             "day to begin fetching data for? (E.g. if $grabber\n" .
@@ -117 +141 @@
     $config->{option_days_offset} ||= '--offset';
 
-    print   "\nAssuming today is day 1 and tomorrow is day 2, which day(s)\n" .
-            "will $grabber retrieve data for if invoked with the following\n" .
-            "command:\n" .
+    print   "\nIf invoked with the command:\n" .
             "  ./$grabber $config->{option_days} 2 $config->{option_days_offset} 1\n" .
-            "Enter a range, such as \"2-4\" or \"2-2\".\n\n";
-    $s = ask("Days fetched with the above option? " .
-            "[default=2-2]");
-    $s ||= '2-2';
-    if ($s =~ /(\d)-(\d)/)
+            "... how many days of data will $grabber fetch?\n\n";
+    $s = ask("Days fetched? [default=2]");
+    $s ||= 2;
+    unless ($s == 2)
     {
-        $config->{option_days_adjust} = 2- $2;
-        $config->{option_days_offset_adjust} = 2- $1;
+        $config->{option_offset_eats_days} = 1;
     }
 
+#    print   "\nIf today is day 1 and tomorrow is day 2, which day(s) will\n" .
+#           "$grabber retrieve data for if invoked with the command:\n" .
+#           "  ./$grabber $config->{option_days} 2 $config->{option_days_offset} 1\n" .
+#           "Enter a range, such as \"2-3\" or \"2-2\".\n\n";
+#    $s = ask("Days fetched with the above option? " .
+#           "[default=2-3]");
+#    $s ||= '2-3';
+#    if ($s =~ /(\d)-(\d)/)
+#    {
+#       $config->{option_days_offset_adjust} = 2 - $config->{day_zero} - $1;
+#       if ($2 - $config->{day_zero} != 3)
+#       {
+#           $config->{option_days_includes_offset} = 1;
+#       }
+#
+#   }
+
 }
 
 print "\n";
 
-$s = ask_boolean("Can $grabber fetch a single channel of data only? ");
-
-if ($s)
-{
-    $g .= 'c';
-    print   "\nWhat option needs to be sent to $grabber to specify\n" .
-            "the channels wanted? For example, if $grabber can be\n" .
-            "instructed to fetch data for channels Seven and Nine by\n" .
-            "the option \"--channels Seven,Nine\", enter \"--channels\".\n\n";
-    
-    $config->{option_channels} = ask("Command-line option for channels? " .
-            "[default=--channels]");
-    $config->{option_channels} ||= '--channels';
-}
-
-$config->{granularity} = $g;
-
-print   "\nCATEGORY: Caching\n\n" .
-        "Some grabbers use an internal cache, to avoid re-fetching data.\n\n";
-
-$config->{cache} = ask_boolean("Does $grabber use an internal cache?");
-
-if ($config->{cache})
-{
-
-    print   "\nSome grabbers are able to run in \"cheap\" mode, which\n" .
-            "means they verify and return their internal cache without\n" .
-            "fetching many web pages or taking too long to run.\n\n";
-    $config->{cheap_mode} = ask_boolean("Does $grabber have a \"cheap\" mode?");
-    if ($config->{cheap_mode})
-    {
-        $config->{option_cheap} = ask("\nWhat option enables this \"cheap\" " .
-                "mode? [default=--cheap]");
-        $config->{option_cheap} ||= '--cheap';
-    }
-
-    # Possibly ask a question about cache verification
-}
+# I think we'll rewrite channels.conf to simulate this for all grabbers
+# (or rather, write temporary channels.conf files).
+#
+#$s = ask_boolean("Can $grabber fetch a single channel of data only? ");
+#
+#if ($s)
+#{
+#    $g .= 'c';
+#    print   "\nWhat option needs to be sent to $grabber to specify\n" .
+#           "the channels wanted? For example, if $grabber can be\n" .
+#           "instructed to fetch data for channels Seven and Nine by\n" .
+#           "the option \"--channels Seven,Nine\", enter \"--channels\".\n\n";
+#    
+#    $config->{option_channels} = ask("Command-line option for channels? " .
+#           "[default=--channels]");
+#    $config->{option_channels} ||= '--channels';
+#}
+#
+#$config->{granularity} = $g;
+
+if ($config->{category} == 1)
+{
+    print   "\nCATEGORY: Verified Caching\n\n" .
+            "Category 1 grabbers often have an internal cache. They can use this\n" .
+            "to greatly reduce the amount of downloads necessary, by returning the\n" .
+            "cached data rather than fetching it anew. An important part of this\n" .
+            "process is verification, or checking to make sure that the schedule\n" .
+            "hasn't changed significantly from the cache.\n\n";
+
+    $config->{cache} = ask_boolean("Can $grabber reduce downloads by through verified caching?", 1);
+}
+
+# I think this is no longer needed because Shepherd will keep track of
+# what's in the cache, yes?
+#
+#
+#if ($config->{cache})
+#{
+#
+#    print   "\nSome grabbers are able to run in \"cheap\" mode, which\n" .
+#           "means they verify and return their internal cache without\n" .
+#           "fetching many web pages or taking too long to run.\n\n";
+#    $config->{cheap_mode} = ask_boolean("Does $grabber have a \"cheap\" mode?");
+#    if ($config->{cheap_mode})
+#    {
+#       $config->{option_cheap} = ask("\nWhat option enables this \"cheap\" " .
+#               "mode? [default=--cheap]");
+#       $config->{option_cheap} ||= '--cheap';
+#    }
+#
+#}
 
 print   "\nCATEGORY: Description\n\n" .
@@ -179 +229 @@
 $config->{desc} = ask("Description?");
 
-print   "\nCONFIGURATION COMPLETE\n\n" .
+print   "\nCONFIGURATION COMPLETE!\n\n" .
         "Grabber: $grabber\n" .
         Dumper($config);