sub new {
my $class = shift;
- my $self = {'_DEBUG' => 0,
- '_CONNECTOR' => undef,
- API => {
- io => sub { printf(@_) },
+ my $self = {'_CONNECTOR' => undef,
+ _API => {
+ io => sub { print(@_) },
+ io_debug => sub { print(@_) },
connectors => sub { return ({ 'name' => 'direct',
'schemas' => {} }) },
},
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 {
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;
}
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);
}
}
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->_getval($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";
}
$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);
return $s;
}
-sub setdebug {
- my $self = shift;
-
- $self->{'_DEBUG'} = shift;
-}
-
sub ua {
my $self = shift;
my $ua;
$ua = LWP::UserAgent->new(
'agent' => 'Mozilla/5.0',
'cookie_jar' => HTTP::Cookies->new,
+ 'parse_head' => 0,
'timeout' => 15,
);
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;
}
}
#
+# This function was used in previous versions of videosite. If it's called
+# we are dealing with an old plugin which probably needs some minor modifications
+# to work properly.
+#
+# Generate a warning message.
+#
+sub _prepare_parameters {
+ my $self = shift;
+
+ $self->error("THIS MODULE IS CALLING _prepare_parameters(). THIS FUNCTION IS DEPRECATED. See readme.txt in the plugin directory.");
+}
+
+#
# 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;