X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite-irssi.pl;h=441ad3ecb541993cdb584300ff3ae82d461d3bd4;hb=f6f36c640976a5e70a5244a793d6f0a6b4c856b6;hp=26ecfe59d5dd738958fffef565a63874aee49a1d;hpb=ac08a598f6a09beeb1e1ea5f7508a338cf7d5c1c;p=videosite.git

diff --git a/videosite-irssi.pl b/videosite-irssi.pl
index 26ecfe5..441ad3e 100644
--- a/videosite-irssi.pl
+++ b/videosite-irssi.pl
@@ -26,6 +26,14 @@ my %foreground_colors = (
 );
 
 #
+# 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:
@@ -99,7 +107,7 @@ sub config_init {
 
     # Copy the "basic" settings.
     foreach (qw(getter mode)) {
-        config_set(['getter'], $conf->{videosite}->{$_});
+        config_set([$_], $conf->{videosite}->{$_});
     }
 
     # Copy the per-getter/setter settings
@@ -126,7 +134,7 @@ sub config_init {
             }
         }
     }
-    config_set(['active-connectors'], join(",", @{$conf->{connectorlist}}));
+    config_set(['active-connectors'], join(",", @{$conf->{videosite}->{connectorlist}}));
     config_set(['defined-connectors'], join(",", @connectors));
     config_set(['config-version'], '2');
 }
@@ -140,10 +148,10 @@ sub config_get {
     my $val;
 
 
-    Irssi::settings_add_str('videosite', $item, "\0");
+    Irssi::settings_add_str('videosite', $item, $config_canary);
     $val = Irssi::settings_get_str($item);
 
-    return ($val ne "\0")?$val:undef;
+    return ($val ne $config_canary)?$val:undef;
 }
 
 #
@@ -153,8 +161,8 @@ sub config_has {
     my $path = shift;
     my $item = join('.', 'videosite', @{$path});
 
-    Irssi::settings_add_str('videosite', $item, "\0");
-    return Irssi::settings_get_str($item) ne "\0";
+    Irssi::settings_add_str('videosite', $item, $config_canary);
+    return Irssi::settings_get_str($item) ne $config_canary;
 }
 
 #
@@ -165,18 +173,21 @@ sub config_set {
     my $value = shift;
     my $item = join('.', 'videosite', @{$path});
 
-    Irssi::settings_add_str('videosite', $item, "\0");
+    Irssi::settings_add_str('videosite', $item, $config_canary);
     Irssi::settings_set_str($item, $value);
 }
 
 #
 # Delete a configuration value. Called by the core.
 #
+# Now, according to the configuration Irssi::settings_remove() removes a
+# config settings. This does not work in any irssi version available to me.
+# So just set the key to the canary value.
+#
 sub config_del {
     my $path = shift;
-    my $item = join('.', 'videosite', @{$path});
 
-    Irssi::settings_remove($item);
+    config_set($path, $config_canary);
 }
 
 #
@@ -222,6 +233,22 @@ sub message_hook {
 }
 
 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,
@@ -233,6 +260,7 @@ sub videosite_reset {
         color => \&colorpair,
         module_path => sub { return File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts') },
         quote => sub { s/%/%%/g; return $_ },
+        reload => \&videosite_reset,
         _debug => sub { 1 },
     })) {
         Irssi::print(sprintf("videosite API register failed: %s", $libvideosite::error));
@@ -248,16 +276,11 @@ sub videosite_reset {
 }
 
 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]) });