Merge branch 'master' of http://10.200.0.3/GIT/videosite

diff --git a/videosite/AsyncFileGetter.pm b/videosite/AsyncFileGetter.pm
index 7a67b43..e9af7e4 100644 (file)
--- a/videosite/AsyncFileGetter.pm
+++ b/videosite/AsyncFileGetter.pm
@@ -1,5 +1,5 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
-#     2008-2009 by Christian Garbs <mitch@cgarbs.de>
+#     2008-2009,2011 by Christian Garbs <mitch@cgarbs.de>
 #
 # licensed under GNU GPL v2
 #
@@ -54,10 +54,28 @@ sub get {
 
     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;
 }

diff --git a/videosite/AsyncWgetFileGetter.pm b/videosite/AsyncWgetFileGetter.pm
index ef54e92..43366a3 100644 (file)
--- a/videosite/AsyncWgetFileGetter.pm
+++ b/videosite/AsyncWgetFileGetter.pm
@@ -1,5 +1,5 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
-#     2008-2009 by Christian Garbs <mitch@cgarbs.de>
+#     2008-2009,2011 by Christian Garbs <mitch@cgarbs.de>
 #     2010 by Maximilian Rehkopf <otakon@gmx.net>
 # licensed under GNU GPL v2
 #
@@ -53,10 +53,28 @@ sub get {
 
     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 = "--header=\"Cookie: $video->{'COOKIE'}\"" if (defined $video->{'COOKIE'});
     my $cmdline = "( wget -q -O\"$tmpfile\" $cookie \"$video->{'DLURL'}\" && mv \"$tmpfile\" \"$dlfile\" && chmod =rw \"$dlfile\" && touch \"$dlfile\" || rm -f \"$tmpfile\" ) &";
     $self->debug("Going to execute: %s", $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;
 }