X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FAsyncWgetFileGetter.pm;h=145d7ad6120b0a53b2b7162e6bab5a652e71195c;hb=1cfec45c0c1cac8fdebca4313c3bcfb3a9f1ab07;hp=8f046563548c123d70208602cad2d4cc5e2bd520;hpb=a21902ff29384676eb0e776140a81a67f81dc8c6;p=videosite.git

diff --git a/videosite/AsyncWgetFileGetter.pm b/videosite/AsyncWgetFileGetter.pm
index 8f04656..145d7ad 100644
--- a/videosite/AsyncWgetFileGetter.pm
+++ b/videosite/AsyncWgetFileGetter.pm
@@ -1,6 +1,7 @@
 # (c) 2007 by Ralf Ertzinger <ralf@camperquake.de>
-#     2008-2009 by Christian Garbs <mitch@cgarbs.de>
+#     2008-2009,2011-2012 by Christian Garbs <mitch@cgarbs.de>
 #     2010 by Maximilian Rehkopf <otakon@gmx.net>
+#
 # licensed under GNU GPL v2
 #
 # A getter which will download the media to a local file storage
@@ -43,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");
@@ -53,18 +56,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 (keys(%{$schemas})) {
-	    $self->debug("Setting %s_proxy to %s", $_, $schemas->{$_});
-	    $ENV{ $_.'_proxy'} = $schemas->{$_};
-	}
+        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;
 }