X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FAsyncWgetFileGetter.pm;h=7a3642a456c5ff56384ac887896dd7113d114941;hb=9257f7504905acaae56297cf7f1a479853e68fe7;hp=ce68046896aff60288020140f355a763f3f542fa;hpb=43a855287b9c17a6691a685d3232cb5f19194ed7;p=videosite.git

diff --git a/videosite/AsyncWgetFileGetter.pm b/videosite/AsyncWgetFileGetter.pm
index ce68046..7a3642a 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
@@ -19,14 +20,12 @@ use MIME::Base64;
 
 sub new {
     my $class = shift;
-    my $self = $class->SUPER::new();
-
-    $self->{'NAME'} = 'asyncwgetfilegetter';
+    my $self = $class->SUPER::new(
+        NAME => 'asyncwgetfilegetter',
+        @_,
+    );
 
-    bless($self, $class);
-    $self->_prepare_parameters();
-
-    return $self;
+    return bless($self, $class);
 }
 
 sub get {
@@ -35,6 +34,7 @@ sub get {
     my $dlfile;
     my $dirname;
     my $cookie = "";
+    my $useragent = "--user-agent=Mozilla/5.0";
 
     $dlfile = sprintf($self->_getval('FILEPATTERN'),
         $self->_encode($video->{'SOURCE'}),
@@ -43,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");
@@ -53,10 +55,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\" || rm -f \"$tmpfile\" ) &";
-    $self->debug(encode_base64($cmdline));
+    my $cmdline = "( wget -q -O\"$tmpfile\" $useragent $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;
 }