X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FBase.pm;h=1bd229fbb175ae891b0ef2870acda3e3ab7c9fc8;hb=5979c22b30775fa2ebe09b3b415246d73a50bd17;hp=415f961a1b1a80b611ee976d112dfeb802171018;hpb=2838787b695838be443c7f1bd0b9278452a07e65;p=videosite.git

diff --git a/videosite/Base.pm b/videosite/Base.pm
index 415f961..1bd229f 100644
--- a/videosite/Base.pm
+++ b/videosite/Base.pm
@@ -10,16 +10,16 @@ use Data::Dumper;
 
 sub new {
     my $class = shift;
-    my $self = {'_DEBUG' => 0,
-                '_CONNECTOR' => undef,
+    my $self = {'_CONNECTOR' => undef,
                 _API => {
-                    io => sub { printf(@_) },
+                    io => sub { print(@_) },
+                    io_debug => sub { print(@_) },
                     connectors => sub { return ({ 'name' => 'direct',
                                                   'schemas' => {} }) },
                 },
                 @_,
                };
-    
+
     # Add the 'enabled' property to all modules
     $self->{_PARAMS}->{enabled} = [1, 'Whether the module is enabled'];
     bless($self, $class);
@@ -40,8 +40,9 @@ sub debug {
     my $self = shift;
     my @data = @_;
 
-    $data[0] = "DEBUG: " . $data[0];
-    if ($self->{'_DEBUG'} != 0) {$self->error(@data)};
+    $data[0] = "("  . ref($self) . ") " . $data[0];
+
+    $self->{_API}->{io_debug}->(@data);
 }
 
 sub _getval {
@@ -148,12 +149,6 @@ sub gethelpstr {
     return $s;
 }
 
-sub setdebug {
-    my $self = shift;
-
-    $self->{'_DEBUG'} = shift;
-}
-
 sub ua {
     my $self = shift;
     my $ua;
@@ -161,6 +156,7 @@ sub ua {
     $ua = LWP::UserAgent->new(
             'agent' => 'Mozilla/5.0',
             'cookie_jar' => HTTP::Cookies->new,
+            'parse_head' => 0,
             'timeout' => 15,
             );
 
@@ -168,6 +164,15 @@ sub ua {
     delete($ENV{'HTTPS_PROXY'});
 
     if (defined($self->{'_CONNECTOR'})) {
+        #
+        # The "environment" connector is special, it loads proxies from
+        # the environment variables. It also does not define any schemas,
+        # so the code below will not reset this.
+        #
+        if ($self->{'_CONNECTOR'}->{'name'} eq 'environment') {
+            $self->debug("Using proxy settings from environment");
+            $ua->env_proxy;
+        }
         my $schemas = $self->{'_CONNECTOR'}->{'schemas'};
         foreach (keys(%{$schemas})) {
             $self->debug("Adding schema %s with proxy %s", $_, $schemas->{$_});
@@ -175,7 +180,7 @@ sub ua {
                 # OK, so here's the gist.
                 #
                 # The usual way of reqesting an HTTPS URL through a proxy is
-                # to connect to the proxy server, issue a CONNECT request to 
+                # to connect to the proxy server, issue a CONNECT request to
                 # create a channel to the web server and start an SSL session over
                 # this channel, so there is an end-to-end connection between
                 # the client and the server.
@@ -215,7 +220,10 @@ sub simple_get {
     my $ua = shift || $self->ua();
     my $r;
 
+    $self->debug("Getting %s", $url);
     $r = $ua->get($url);
+    $self->debug("Return code: %s", $r->status_line);
+    $self->debug("Content length: %d", length($r->decoded_content)) if $r->is_success();
     return $r->decoded_content() if $r->is_success();
     return undef;
 }
@@ -237,7 +245,7 @@ sub decode_querystring {
 
 sub connectors {
     my $self = shift;
-    
+
     return $self->{_API}->{connectors}->();
 }