Changeset 590 for grabbers/jrobbo

Timestamp:

03/04/07 19:25:06 (6 years ago)

Author:

max

Message:

jrobbo now uses IO::Uncompress::unzip and performs extraction in memory rather than piping through /usr/bin/unzip.

This adds a new dependency, but a relatively common one. The advantage is
that user systems without /usr/bin/unzip will no longer run this grabber
uselessly nor die with runtime errors.

Files:

• grabbers/jrobbo (modified) (6 diffs)

grabbers/jrobbo

@@ -8 +8 @@
 
 my $progname = "jrobbo";
-my $version = "0.06";
+my $version = "0.07";
 
 use LWP::UserAgent;
 use Getopt::Long;
 use XMLTV;
+use IO::Uncompress::Unzip qw(unzip $UnzipError) ;
 $| = 1;
 
@@ -43 +44 @@
 $opt->{channels_file} =         "";
 $opt->{outputfile} =            "output.xmltv";
-$opt->{downloadfile} =          "last_jrobbo_download.zip";
 $opt->{region} =                94;
 
@@ -57 +57 @@
         'channels_file=s' => \$opt->{channels_file},    # ignored
         'output=s'      => \$opt->{outputfile},
-        'downloadfile=s' => \$opt->{downloadfile},
         'warper'        => \$opt->{warper},
         'anonymous'     => \$opt->{anonymous},
@@ -77 +76 @@
         printf "   --region=<i>           region as per the table below (default $opt->{region})\n";
         printf "   --output=<file>        file to send output to (default $opt->{outputfile})\n";
-        printf "   --downloadfile=<file>  file to send output to (default $opt->{downloadfile})\n";
         printf "   --warper               fetch via webwarper (default: don't)\n";
         printf "   --anonymous            fetch anonymously (default: don't)\n";
@@ -149 +147 @@
 die "Failed to fetch $url after 3 retries!\n" if (!($response->is_success));
 
-open(F,">$opt->{downloadfile}") || die "can't open $opt->{downloadfile} for writing: $!\n";
-print F $response->content;
-close(F);
-
-
 #
 # 4. uncompress data
@@ -159 +152 @@
 
 my $data;
-my $inputpipe = "/usr/bin/unzip -p $opt->{downloadfile} |";
-open(INFILE,"$inputpipe") || die "can't open $inputpipe for reading: $!\n";
-while (<INFILE>) {
-        $data .= $_;
-}
-close(INFILE);
-
+unzip \$response->content => \$data 
+    or die "unzip failed: $UnzipError\n";
 
 #