Changeset 272

Timestamp:

11/21/06 19:03:15 (7 years ago)

Author:

max

Message:

Rex runs from CWD, fixes {7}.

Files:

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

grabbers/rex

@@ -3 +3 @@
 # "Rex"
 
-my $version  = '3.3.6';
+my $version  = '3.3.7';
 
 # An Australian TV Guide Grabber (a.k.a. tv_grab_au)
@@ -68 +68 @@
 # 3.3.5   : Bugfix : support opt_channels (HDTV in Shepherd)
 # 3.3.6   : Bugfix : neater options parsing
+# 3.3.7   : Bugfix : now runs from current dir, not ~/.rex/
 
 use strict;
@@ -80 +81 @@
 use JavaScript;
 use Storable;
+use Cwd;
 
 use XMLTV;
@@ -89 +91 @@
 my $progname = "Rex";
 my $lang = "en";
-
-my $output_dir = ($ENV{HOME} ? $ENV{HOME} . "/." : "/var/local/") . 
-                 lc($progname);         # Default location is ~/.rex/
-
-my $cache_file = "$output_dir/cache.dat";
 
 my ($count_dl, $count_detail, $count_bad, $count_cache, $count_changes, $count_kb) = (0) x 6;
@@ -363 +360 @@
   return if ($opt->{test} or $opt->{nowrite_cache});
   print "Saving cache.\n";
-  Storable::store($cached, $cache_file);
+  Storable::store($cached, $opt->{'cache-file'});
 }
 
@@ -469 +466 @@
   unless ($opt->{'ignore-cache'} or $opt->{'rebuild-cache'})
   {
-    if (-r $cache_file)
-    {
-      $cached = Storable::retrieve($cache_file);
+    if (-r $opt->{'cache-file'})
+    {
+      $cached = Storable::retrieve($opt->{'cache-file'});
     }
     else
     {
-      print "Unable to read cache file: $cache_file.\n";
+      print "Unable to read cache file: " . $opt->{'cache-file'} . ".\n";
     }
   }
@@ -946 +943 @@
           "Test mode  : " . is_set($opt->{test}) . "\n" .
           "Webwarping : " . is_set($opt->{warper}) . "\n" .
-          "Cache file : $cache_file";
+          "Cache file : " . $opt->{'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'});
@@ -986 +983 @@
           'region' => 94,
           'stats' => 300,
-          'output' => "$output_dir/guide.xml",
-          'channels_file' => "$output_dir/channels.conf"
+          'output' => cwd() . '/output.xmltv',
+          'cache-file' => cwd() . '/cache.dat',
+          'channels_file' => cwd() . '/channels.conf'
   };
                                               

status

@@ -2 +2 @@
 engine          dog                 0.3.10
 grabber         yahoo7widget        1.58-r1
-grabber         rex                 3.3.6-r1
+grabber         rex                 3.3.7
 grabber         abc_website         1.70-r1
 grabber         abc2_website        1.70-r1