Remove _prepare_parameters() and mergeconfig()

[videosite.git] / videosite / Base.pm

diff --git a/videosite/Base.pm b/videosite/Base.pm
index b31fcb6..c641f2d 100644 (file)
--- a/videosite/Base.pm
+++ b/videosite/Base.pm
@@ -11,16 +11,19 @@ use Data::Dumper;
 sub new {
     my $class = shift;
     my $self = {'_DEBUG' => 0,
-                '_OUT' => sub {printf(@_)},
-                '_CONNECTORS' => sub { return ({ 'name' => 'direct',
-                                                 'schemas' => {} }) },
                 '_CONNECTOR' => undef,
+                API => {
+                    io => sub { printf(@_) },
+                    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);
 
-    $self->_prepare_parameters();
-
     return $self;
 }
 
@@ -30,7 +33,7 @@ sub error {
 
     $data[0] = "(" . ref($self) . ") " . $data[0];
 
-    $self->{'_OUT'}(@data);
+    $self->{_API}->{io}->(@data);
 }
 
 sub debug {
@@ -41,33 +44,6 @@ sub debug {
     if ($self->{'_DEBUG'} != 0) {$self->error(@data)};
 }
 
-sub mergeconfig {
-    my $self = shift;
-    my $c = shift;
-    my $o;
-
-    return $self->{'_CONFIG'} unless defined($c);
-
-    foreach $o (keys(%{$c->{'option'}})) {
-        if (exists($self->{'_CONFIG'}->{'option'}->{$o})) {
-            $self->{'_CONFIG'}->{'option'}->{$o}->{'content'} = $c->{'option'}->{$o}->{'content'};
-        }
-    }
-
-    return $self->{'_CONFIG'};
-}
-
-sub _prepare_parameters {
-    my $self = shift;
-    my $p;
-
-    $self->{'_CONFIG'} = {'option' => {'enabled' => {'content' => '1'}}};
-
-    foreach $p (keys(%{$self->{'_PARAMS'}})) {
-        $self->{'_CONFIG'}->{'option'}->{$p}->{'content'} = $self->{'_PARAMS'}->{$p}->[0];
-    }
-}
-
 sub _getval {
     my $self = shift;
     my $key = shift;
@@ -91,13 +67,6 @@ sub setval {
     }
 }
 
-sub setio {
-    my $self = shift;
-    my $io = shift;
-
-    $self->{'_OUT'} = $io;
-}
-
 sub getconfstr {
     my $self = shift;
     my $s = 'Options for ' . $self->{'NAME'} . ":\n";
@@ -181,7 +150,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 +190,17 @@ 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;
@@ -249,7 +230,7 @@ sub decode_querystring {
 sub connectors {
     my $self = shift;
     
-    return $self->{'_CONNECTORS'}->();
+    return $self->{_API}->{connectors}->();
 }
 
 sub selectconn {
@@ -258,10 +239,19 @@ sub selectconn {
     $self->{'_CONNECTOR'} = shift;
 }
 
-sub setconn {
+#
+# Register a callbacks into the core API to the plugin.
+# Example of those are config getter/setters and IO functions
+# The API is a hash reference containing subroutine references.
+#
+# After the API is registered an attempt is made to load the config
+# (or set defaults if config values are not found)
+#
+sub register_api {
     my $self = shift;
+    my $api = shift;
 
-    $self->{'_CONNECTORS'} = shift;
+    $self->{_API} = $api;
 }
 
 1;