X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FAsyncFileGetter.pm;h=fa44e56823017ac490ad8703dca5f3f59dd9f632;hb=f092ead6902305e6630adaa6197d551a5c537d20;hp=3610584522ed9a2da5edfa973600c8d251e29b06;hpb=0993a33d32073a09287967fe00845cebd479de79;p=videosite.git

diff --git a/videosite/AsyncFileGetter.pm b/videosite/AsyncFileGetter.pm
index 3610584..fa44e56 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,14 +7,15 @@
 # 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 {
@@ -34,6 +35,7 @@ sub get {
     my $video = shift;
     my $dlfile;
     my $dirname;
+    my $cookie = "";
 
     $dlfile = sprintf($self->_getval('FILEPATTERN'),
         $self->_encode($video->{'SOURCE'}),
@@ -42,6 +44,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");
@@ -50,9 +54,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 $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;
 }