Changeset 186

Timestamp:

11/06/06 18:00:30 (7 years ago)

Author:

max

Message:

Tidied options handling.

Files:

• grabbers/rex (modified) (10 diffs)
• status (modified) (1 diff)

grabbers/rex

@@ -3 +3 @@
 # "Rex"
 
-my $version  = '3.3.5';
+my $version  = '3.3.6';
 
 # An Australian TV Guide Grabber (a.k.a. tv_grab_au)
@@ -54 +54 @@
 # 2.5.0   : Feature: altered/added --ignore-cache, --nowrite-cache, and
 #                    --rebuild-cache options; exit on unknown option
-# 3.0.0   : Shepherd compatibility
+# 3.0.0   : Shepherd compliance
 # 3.1.0   : Feature: --ready option
 # 3.2.0   : Feature: gzip compression, report KB downloaded
@@ -66 +66 @@
 # 3.3.3   : Bugfix : more regexp tweaking; fixed premiere tag
 # 3.3.4   : Bugfix : tweaked Rex's name in XMLTV output
+# 3.3.5   : Bugfix : support opt_channels (HDTV in Shepherd)
+# 3.3.6   : Bugfix : neater options parsing
 
 use strict;
@@ -106 +108 @@
 my $firstfetch;
 my $debug = 0;
-my $opt;
+my $opt = { };
 my $channels = {};
 my $opt_channels = {};
@@ -130 +132 @@
 get_command_line_options();
 
-print "Ignoring --config-file option.\n" if ($opt->{configfile});
-
-exit 0 if ($opt->{ver}) or ($opt->{ready});
+print "Ignoring --config-file option.\n" if ($opt->{'config-file'});
+
+exit 0 if ($opt->{version});
 
 help() if ($opt->{help});
@@ -148 +150 @@
 build_channel_map();
 
-if ($opt->{show_channels})
+if ($opt->{'show-channels'})
 {
   show_channels();
@@ -154 +156 @@
 }
 
-if ($debug or $opt->{show_config})
+if ($debug or $opt->{'show-config'})
 {
   show_config();
-  exit 0 if ($opt->{show_config});
+  exit 0 if ($opt->{'show-config'});
 }
 
@@ -465 +467 @@
 sub restore_cache
 {
-  unless ($opt->{ignore_cache} or $opt->{rebuild_cache})
+  unless ($opt->{'ignore-cache'} or $opt->{'rebuild-cache'})
   {
     if (-r $cache_file)
@@ -902 +904 @@
 sub get_command_line_options
 {
-  GetOptions( 'help'            => \$opt->{help},
-              'debug'           => \$debug,
-              'days=i'          => \$opt->{days},
-              'offset=i'        => \$opt->{offset},
-              'show-channels'   => \$opt->{show_channels},
-              'output=s'        => \$opt->{output},
-              'rebuild-cache'   => \$opt->{rebuild_cache},
-              'ignore-cache'    => \$opt->{ignore_cache},
-              'nowrite-cache'   => \$opt->{nowrite_cache},
-              'dump-cache'      => \$opt->{dump_cache},
-              'test'            => \$opt->{test},
-              'show-config'     => \$opt->{show_config},
-              'warper'          => \$opt->{warper},
-              'cache-file=s'    => \$cache_file,
-              'stats=i'         => \$opt->{stats},
-              'region=i'        => \$opt->{region},
-              'channels_file=s' => \$opt->{channels_file},
-              'version'         => \$opt->{ver},
-              'desc'            => \$opt->{desc},
-              'ready'           => \$opt->{ready},
-              'config-file=s'   => \$opt->{configfile}
-             );
+  GetOptions($opt, qw(
+                        help
+                        debug
+                        output=s
+                        days=i
+                        offset=i
+                        region=i
+                        show-config
+                        show-channels
+                        rebuild-cache
+                        ignore-cache
+                        nowrite-cache
+                        dump-cache
+                        cache-file=s
+                        config-file=s
+                        channels_file=s
+                        stats=i
+                        test
+                        desc
+                        version
+                        warper
+                    ));
+  $debug = $opt->{debug};   
 
   if (@ARGV)
@@ -944 +947 @@
           "Webwarping : " . is_set($opt->{warper}) . "\n" .
           "Cache file : $cache_file";
-    print ' (not reading)' if ($opt->{ignore_cache} or $opt->{rebuild_cache});
-    print ' (not updating)' if ($opt->{test} or $opt->{ignore_cache} or $opt->{nowrite_cache});
+    print ' (not reading)' if ($opt->{'ignore-cache'} or $opt->{'rebuild-cache'});
+    print ' (not updating)' if ($opt->{test} or $opt->{'ignore-cache'} or $opt->{'nowrite-cache'});
     print "\n" .
           "Output file: " . ($opt->{output} ? $opt->{output} : "None") . "\n" .

status

@@ -2 +2 @@
 shepherd        shepherd            0.2.32
 grabber         yahoo7widget        1.57
-grabber         rex                 3.3.5-r2
+grabber         rex                 3.3.6
 grabber         abc_website         1.58
 grabber         abc2_website        1.58