);
#
+# This is a canary value used in the config system as the default
+# value. As irssi does not have a way to test if a setting exists
+# this is used instead. A config value is never expected to be set
+# to this value and be valid.
+#
+my $config_canary = "\1";
+
+#
# Initialize the config subsystem. Called by the core.
#
# Due to historic reasons this has to deal with a number of possible config sources:
my $val;
- Irssi::settings_add_str('videosite', $item, "\1");
+ Irssi::settings_add_str('videosite', $item, $config_canary);
$val = Irssi::settings_get_str($item);
- return ($val ne "\1")?$val:undef;
+ return ($val ne $config_canary)?$val:undef;
}
#
my $path = shift;
my $item = join('.', 'videosite', @{$path});
- Irssi::settings_add_str('videosite', $item, "\1");
- return Irssi::settings_get_str($item) ne "\1";
+ Irssi::settings_add_str('videosite', $item, $config_canary);
+ return Irssi::settings_get_str($item) ne $config_canary;
}
#
my $value = shift;
my $item = join('.', 'videosite', @{$path});
- Irssi::settings_add_str('videosite', $item, "\1");
+ Irssi::settings_add_str('videosite', $item, $config_canary);
Irssi::settings_set_str($item, $value);
}
sub config_del {
my $path = shift;
- config_set($path, "\1");
+ config_set($path, $config_canary);
}
#
my ($cmdline, $server, $witem) = @_;
my %event = (
message => $cmdline,
- ewpf => sub { defined($witem)?$witem->print($_[0]):Irssi::print($_[0]) },
+ ewpf => sub { defined($witem)?$witem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) },
);
libvideosite::handle_command(\%event);
my $evitem = $server->window_item_find($channel);
my %event = (
message => $msg,
- ewpf => sub { defined($evitem)?$evitem->print($_[0]):Irssi::print($_[0]) },
+ ewpf => sub { defined($evitem)?$evitem->print($_[0], MSGLEVEL_CLIENTCRAP):Irssi::print($_[0]) },
);
libvideosite::check_for_link(\%event);
}
sub videosite_reset {
+ my $libpath;
+
+ # Find out the script directory, and add it to @INC.
+ # This is necessary to find libvideosite.pm
+ $libpath = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
+
+ # If the library is already loaded unload it
+ foreach (keys(%INC)) {
+ if ($INC{$_} eq File::Spec->catfile($libpath, 'libvideosite.pm')) {
+ delete($INC{$_});
+ }
+ }
+
+ push(@INC, $libpath);
+ load 'libvideosite';
+
unless(libvideosite::register_api({
io => sub { Irssi::print($_[0]) },
config_init => \&config_init,
config_get => \&config_get,
config_set => \&config_set,
config_has => \&config_has,
- config_save => \&config_save,
+ config_save => sub { 1 },
config_del => \&config_del,
color => \&colorpair,
module_path => sub { return File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts') },
quote => sub { s/%/%%/g; return $_ },
- _debug => sub { 1 },
+ reload => \&videosite_reset,
})) {
Irssi::print(sprintf("videosite API register failed: %s", $libvideosite::error));
return 0;
}
sub videosite_init {
- # Find out the script directory, and add it to @INC.
- # This is necessary to find libvideosite.pm
-
- push(@INC, File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts'));
- load 'libvideosite';
if (videosite_reset()) {
signal_add_last("message public", sub { message_hook(@_) });
signal_add_last("message own_public", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });
- signal_add_last("message private", sub { message_hooK($_[0], $_[1], $_[2], $_[3], $_[2]) });
+ signal_add_last("message private", sub { message_hook($_[0], $_[1], $_[2], $_[3], $_[2]) });
signal_add_last("message own_private", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });
signal_add_last("message irc action", sub { message_hook(@_) });
signal_add_last("message irc own_action", sub { message_hook($_[0], $_[1], undef, undef, $_[2]) });