X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FAsyncFileGetter.pm;h=c47f9ddd97d863948c2e64f8644d903baf1e0045;hb=a644eb433aca424a85dcbfda6e42b0675dfbfd86;hp=04e8226c86d01b63b62472f76391ade9ed213c77;hpb=fbddf7dd61ff256a45764faaec97a3539aaeb200;p=videosite.git

diff --git a/videosite/AsyncFileGetter.pm b/videosite/AsyncFileGetter.pm
index 04e8226..c47f9dd 100644
--- a/videosite/AsyncFileGetter.pm
+++ b/videosite/AsyncFileGetter.pm
@@ -1,5 +1,5 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
-#     2008 by Christian Garbs <mitch@cgarbs.de>
+#     2008-2009,2011-2012 by Christian Garbs <mitch@cgarbs.de>
 #
 # licensed under GNU GPL v2
 #
@@ -7,25 +7,25 @@
 # in the background
 #
 
-package AsyncFileGetter;
+package videosite::AsyncFileGetter;
 
-use FileGetter;
-@ISA = qw(FileGetter);
+use videosite::FileGetter;
+@ISA = qw(videosite::FileGetter);
 
 use strict;
 use LWP::Simple qw(!get);
 use File::Basename;
+use File::Temp qw(tempfile);
+use MIME::Base64;
 
 sub new {
     my $class = shift;
-    my $self = $class->SUPER::new();
+    my $self = $class->SUPER::new(
+        NAME => 'asyncfilegetter',
+        @_,
+    );
 
-    $self->{'NAME'} = 'asyncfilegetter';
-
-    bless($self, $class);
-    $self->_prepare_parameters();
-
-    return $self;
+    return bless($self, $class);
 }
 
 sub get {
@@ -33,6 +33,8 @@ sub get {
     my $video = shift;
     my $dlfile;
     my $dirname;
+    my $cookie = "";
+    my $useragent = "-H \"User-Agent: Mozilla/5.0\"";
 
     $dlfile = sprintf($self->_getval('FILEPATTERN'),
         $self->_encode($video->{'SOURCE'}),
@@ -41,6 +43,8 @@ sub get {
         $self->_encode($video->{'DLURL'}),
         $self->_encode($video)->{'URL'});
 
+    $dlfile =~ s/([\\"])/\\$1/g;
+
     $dirname = dirname($dlfile);
     if ($self->_diskfree($dirname) < $self->_getval('MINFREE')) {
         $self->error("Not enough free space to download");
@@ -49,8 +53,30 @@ sub get {
 
     $self->debug('Going to download %s to %s', $video->{'DLURL'}, $dlfile);
 
-    my $cmdline = "GET \"$video->{'DLURL'}\" > \"$dlfile\" &";
+    my (undef, $tmpfile) = tempfile('videosite.tmp.XXXXXXXXXXXX', DIR => $dirname);
+
+    my %saved_env;
+    
+    if (exists($video->{'CONNECTOR'})) {
+        my $schemas = $video->{'CONNECTOR'}->{'schemas'};
+        foreach my $schemakey(keys(%{$schemas})) {
+            $self->debug("Setting %s_proxy to %s", $schemakey, $schemas->{$schemakey});
+            my $envkey = $schemakey.'_proxy';
+            $saved_env{ $envkey } = $ENV{ $envkey };
+            $ENV{ $envkey } = $schemas->{$schemakey};
+        }
+    }
+    
+    $cookie = "-H \"Cookie: $video->{'COOKIE'}\"" if (defined $video->{'COOKIE'});
+    my $cmdline = "( GET $useragent $cookie \"$video->{'DLURL'}\" > \"$tmpfile\" && mv \"$tmpfile\" \"$dlfile\" && chmod =rw \"$dlfile\" || rm -f \"$tmpfile\" ) &";
+    $self->debug(encode_base64($cmdline));
     system($cmdline);
 
+    # restore environment
+    foreach my $envkey (keys %saved_env) {
+	$self->debug("Restoring environment: %s=%s", $envkey, $saved_env{ $envkey} );
+        $ENV{ $envkey } = $saved_env{ $envkey };
+    }
+
     return 1;
 }