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

[videosite.git] / videosite / Base.pm

diff --git a/videosite/Base.pm b/videosite/Base.pm
index 001ec56..f6108f6 100644 (file)
--- a/videosite/Base.pm
+++ b/videosite/Base.pm
@@ -181,7 +181,11 @@ sub ua {
     my $self = shift;
     my $ua;
 
-    $ua = LWP::UserAgent->new('agent' => 'Mozilla/5.0', 'cookie_jar' => HTTP::Cookies->new);
+    $ua = LWP::UserAgent->new(
+            'agent' => 'Mozilla/5.0',
+            'cookie_jar' => HTTP::Cookies->new,
+            'timeout' => 15,
+            );
 
     # Remove a currently defined HTTPS proxy. See below for a longer explanation.
     delete($ENV{'HTTPS_PROXY'});
@@ -217,9 +221,28 @@ sub ua {
         }
     }
 
+    $self->{_CACHED_UA} = $ua;
+
     return $ua;
 }
 
+sub _cached_ua {
+    my $self = shift;
+
+    return $self->{_CACHED_UA};
+}
+
+sub simple_get {
+    my $self = shift;
+    my $url = shift;
+    my $ua = shift || $self->ua();
+    my $r;
+
+    $r = $ua->get($url);
+    return $r->decoded_content() if $r->is_success();
+    return undef;
+}
+
 sub decode_hexurl {
     my $self = shift;
     my $d = shift;