Changeset 946

Timestamp:

10/10/07 20:39:32 (6 years ago)

Author:

max

Message:

shepherd: implement storing of default cmd line options via --component-set in shepherd.conf, rather than requiring support in individual components. This means that default parameters of any type can now be set for any component.

Closes #62.

Location:

trunk

Files:

• applications/shepherd (modified) (3 diffs)
• grabbers/abc_website.conf (modified) (1 diff)
• status (modified) (2 diffs)

trunk/applications/shepherd

@@ -2 +2 @@
 
 my $progname = 'shepherd';
-my $version = '1.2.24';
+my $version = '1.2.25';
 
 # tv_grab_au
@@ -1366 +1366 @@
     $display_output = 1 if (!defined $display_output);
     $progtype = $components->{$component}->{type} unless ($progtype);
+    if ($components->{$component}->{default_cmdline})
+    {
+        my $parameters = $components->{$component}->{default_cmdline};
+        $parameters =~ s/:/ /g;
+        $prog .= " $parameters";
+    }
 
     my $prog_output = "";
@@ -1817 +1823 @@
     my $arg = join(":",@args);
 
-    if ($component eq $progname) {
-        if ((!defined $arg) || ($arg eq "")) {
-            delete $components->{$progname}->{default_cmdline};
-            &log("\ncleared default options for $progname\n");
-        } else {
-            $components->{$progname}->{default_cmdline} = "--".join(":--",@args);
-            &log("\nset default options for $progname to: ".$components->{$progname}->{default_cmdline}."\n");
-        }
-        write_config_file();
-        return;
-    }
-
     if ((!defined $arg) || ($arg eq "")) {
-        &log("\nNothing to set: you need to use this as --component-set (component):(settings)\n");
-        return;
-    }
-
-    my $opt_set = query_config($component, 'option_set');
-    if (!defined $opt_set) {
-        &log("\nComponent $component does not have any tunable parameters.\n");
-        return;
-    }
-
-    my ($result,$resultmsg,$test_output) = call_prog($component,query_filename($component,$components->{$component}->{type})." $opt_set $arg"." 2>&1",1,1,1);
+        delete $components->{$component}->{default_cmdline};
+        &log("\nCleared default options for $component.\n");
+    } else {
+        $components->{$component}->{default_cmdline} = "--".join(":--",@args);
+        &log("\nSet default options for $component to: --".join(" --",@args)."\n");
+    }
+    &write_config_file;
 }
 

trunk/grabbers/abc_website.conf

@@ -6 +6 @@
             'regions' => '',
             'option_ready' => '--version',
-            'option_set' => '--set',
             'desc' => 'guide data for ABC only from http://www.abc.net.au/tv/guide/netw/',
             'max_days' => '14',

trunk/status

@@ -1 @@
-application     shepherd            1.2.24
+application     shepherd            1.2.25
 reference       channel_list        6
 reference       Shepherd/Common.pm  0.28
@@ -5 +5 @@
 grabber         yahoo7widget        1.92
 grabber         rex                 3.6.1
-grabber         abc_website         3.14
+grabber         abc_website         3.14-r1
 grabber         sbsnews_website     0.18
 grabber         oztivo              1.14