X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite%2FBase.pm;h=923585aee35105f4e41426cbf199666314570532;hb=c3e786cc2000051ed931b918f3e4929b3b0abea8;hp=3c3dd70ca40d2869d0cc4225d12d1a88b48ed1a5;hpb=b8512b6d8f6e4378f5f0942256a4505a72cc7bc9;p=videosite.git

diff --git a/videosite/Base.pm b/videosite/Base.pm
index 3c3dd70..923585a 100644
--- a/videosite/Base.pm
+++ b/videosite/Base.pm
@@ -12,7 +12,7 @@ sub new {
     my $class = shift;
     my $self = {'_DEBUG' => 0,
                 '_CONNECTOR' => undef,
-                API => {
+                _API => {
                     io => sub { printf(@_) },
                     connectors => sub { return ({ 'name' => 'direct',
                                                   'schemas' => {} }) },
@@ -24,8 +24,6 @@ sub new {
     $self->{_PARAMS}->{enabled} = [1, 'Whether the module is enabled'];
     bless($self, $class);
 
-    $self->_prepare_parameters();
-
     return $self;
 }
 
@@ -46,41 +44,23 @@ 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;
+    my $path = ['plugin', $self->{NAME}, $key];
     my $val;
 
-    $val = $self->{'_CONFIG'}->{'option'}->{$key}->{'content'};
-    $self->debug('Returning %s=%s', $key, $val);
+    # Try to read from the global config
+    # Fall back to default
+    if ($self->{_API}->{config_has}->($path)) {
+        $val = $self->{_API}->{config_get}->($path);
+    } elsif (exists($self->{_PARAMS}->{$key})) {
+        $val = $self->{_PARAMS}->{$key}->[0];
+    } else {
+        $self->error('Requested unknown config key %s', $key);
+    }
 
+    $self->debug('Returning %s=%s', $key, $val);
     return $val;
 }
 
@@ -88,11 +68,12 @@ sub setval {
     my $self = shift;
     my $key = shift;
     my $val = shift;
+    my $path = ['plugin', $self->{NAME}, $key];
 
-    if (exists($self->{'_CONFIG'}->{'option'}->{$key})) {
-        $self->{'_CONFIG'}->{'option'}->{$key}->{'content'} = $val;
+    if (exists($self->{'_PARAMS'}->{$key})) {
+        $self->{_API}->{config_set}->($path, $val);
     } else {
-        $self->error('Module %s does not have a parameter named %s', $self->{'NAME'}, $key);
+        $self->error('Module does not have a parameter named %s', $self->$key);
     }
 }
 
@@ -102,11 +83,10 @@ sub getconfstr {
     my $k;
     my $p;
 
-    foreach $k (keys(%{$self->{'_CONFIG'}->{'option'}})) {
-        $p = $self->{'_CONFIG'}->{'option'}->{$k}->{'content'};
-        $p =~ s/%/%%/g;
+    foreach $k (keys(%{$self->{'_PARAMS'}})) {
+        $p = $self->{_API}->{config_get}->{$k};
         $s .= sprintf("  %s: %s", $k, $p);
-        if ($self->{'_CONFIG'}->{'option'}->{$k}->{'content'} eq $self->{'_PARAMS'}->{$k}->[0]) {
+        if ($p eq $self->{'_PARAMS'}->{$k}->[0]) {
             $s .= " (default)\n";
         } else {
             $s .= "\n";
@@ -151,9 +131,8 @@ sub gethelpstr {
     }
 
     $s .= " Options:\n";
-    foreach $k (keys(%{$self->{'_CONFIG'}->{'option'}})) {
+    foreach $k (keys(%{$self->{'_PARAMS'}})) {
         $p = $self->{'_PARAMS'}->{$k}->[0];
-        $p =~ s/%/%%/g;
         if (exists($self->{'_PARAMS'}->{$k}->[2])) {
             # The parameter has a list of allowed values. Add the keys and their help
             $s .= sprintf("  %s: %s (default: %s)\n", $k, $self->{'_PARAMS'}->{$k}->[1], $p);