issue updates

[videosite.git] / videosite.pl

diff --git a/videosite.pl b/videosite.pl
index 21ed709..70b3ffb 100644 (file)
--- a/videosite.pl
+++ b/videosite.pl
@@ -19,7 +19,8 @@ my @getters;
 my $getter;
 my $conf;
 my $conffile = File::Spec->catfile(Irssi::get_irssi_dir(), 'videosite.xml');
-my $plugindir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts', 'videosite');
+my $scriptdir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
+my $plugindir = File::Spec->catfile($scriptdir, 'videosite');
 
 my $PARAMS = {
     'getter' => '',
@@ -45,6 +46,63 @@ signal_add_last("message irc action" => sub {check_for_link(\@_,1,4,2,0);});
 # "message irc own_action", SERVER_REC, char *msg, char *target
 signal_add_last("message irc own_action" => sub {check_for_link(\@_,1,2,-1,0);});
 
+# For tab completion
+signal_add_first('complete word', \&sig_complete);
+
+my $videosite_commands = {
+    'save' => sub {
+        cmd_save();
+    },
+
+    'set' => sub {
+        cmd_set(@_);
+    },
+    
+    'show' => sub {
+        cmd_show(@_);
+    },
+
+    'help' => sub {
+        cmd_help(@_);
+    },
+
+    'getter' => sub {
+        cmd_getter(@_);
+    },
+
+    'enable' => sub {
+        cmd_enable(@_);
+    },
+
+    'disable' => sub {
+        cmd_disable(@_);
+    },
+
+    'reload' => sub {
+        init_videosite(0);
+    },
+
+    'mode' => sub {
+        cmd_mode(@_);
+    },
+
+    'debug' => sub {
+        $debug = 1;
+        foreach (@grabbers, @getters) {
+            $_->setdebug(1);
+        }
+        write_irssi(undef, 'Enabled debugging');
+    },
+
+    'nodebug' => sub {
+        $debug = 0;
+        foreach (@grabbers, @getters) {
+            $_->setdebug(0);
+        }
+        write_irssi(undef, 'Disabled debugging');
+    },
+};
+
 sub write_irssi {
     my $witem = shift;
     my @text = @_;
@@ -215,9 +273,9 @@ sub cmd_help {
     } else {
         write_irssi(undef, <<'EOT');
 Supported commands:
- save: Save the current configuration
- help [modulename]: Display this help, or module specific help
- show [modulename]: Show loaded modules, or the current parameters of a module
+ save: save the current configuration
+ help [modulename]: display this help, or module specific help
+ show [modulename]: show loaded modules, or the current parameters of a module
  set modulename parameter value: set a module parameter to a new value
  getter [modulename]: display or set the getter to use
  enable [modulename]: enable the usage of this module (grabbers only)
@@ -235,8 +293,8 @@ sub cmd_getter {
     my $p;
 
     if (defined($target)) {
-        foreach $p (@getters, @grabbers) {
-            if (($p->{'NAME'} eq $target) && ($p->{'TYPE'} eq 'getter')) {
+        foreach $p (@getters) {
+            if ($p->{'NAME'} eq $target) {
                 $getter = $p;
                 $conf->{'videosite'}->{'getter'} = $target;
                 return;
@@ -289,13 +347,13 @@ sub ploader {
     foreach $p (@list) {
         write_debug(undef, "Trying to load $p:");
         $p =~ s/\.pm$//;
-        eval qq{ require $p; };
+        eval qq{ require videosite::$p; };
         if ($@) {
             write_irssi(undef, "Failed to load plugin: $@");
             next;
         }
 
-        $g = eval $p.q{->new();};
+        $g = eval qq{ videosite::$p->new(); };
         if ($@) {
             write_irssi(undef, "Failed to instanciate: $@");
             delete($INC{$p});
@@ -382,49 +440,58 @@ sub init_videosite {
     write_irssi(undef, 'videosite initialized');
 }
 
-sub cmdhandler {
-    my ($data, $server, $item) = @_;
-    my @params = split(/\s+/, $data);
+sub sig_complete {
+    my ($complist, $window, $word, $linestart, $want_space) = @_;
+    my @matches;
 
-    if ($params[0] eq 'save') {
-        cmd_save();
-    } elsif ($params[0] eq 'set') {
-        shift(@params);
-        cmd_set(@params);
-    } elsif ($params[0] eq 'show') {
-        shift(@params);
-        cmd_show(@params);
-    } elsif ($params[0] eq 'help') {
-        shift(@params);
-        cmd_help(@params);
-    } elsif ($params[0] eq 'getter') {
-        shift(@params);
-        cmd_getter(@params);
-    } elsif ($params[0] eq 'enable') {
-        shift(@params);
-        cmd_enable(@params);
-    } elsif ($params[0] eq 'disable') {
-        shift(@params);
-        cmd_disable(@params);
-    } elsif ($params[0] eq 'reload') {
-        init_videosite(0);
-    } elsif ($params[0] eq 'mode') {
-        shift(@params);
-        cmd_mode(@params);
-    } elsif ($params[0] eq 'debug') {
-        $debug = 1;
+    if ($linestart !~ m|^/videosite\b|) {
+        return;
+    }
+
+    if ('/videosite' eq $linestart) {
+        # No command enterd so far. Produce a list of possible follow-ups
+        @matches = grep {/^$word/} keys (%{$videosite_commands});
+    } elsif ('/videosite set' eq $linestart) {
+        # 'set' command entered. Produce a list of modules
         foreach (@grabbers, @getters) {
-            $_->setdebug(1);
+            push(@matches, $_->{'NAME'}) if $_->{'NAME'} =~ m|^$word|;
+        };
+    } elsif ($linestart =~ m|^/videosite set (\w+)$|) {
+        my $module = $1;
+
+        foreach my $p (@getters, @grabbers) {
+            if ($p->{'NAME'} eq $module) {
+                @matches = $p->getparamlist($word);
+                last;
+            }
         }
-        write_irssi(undef, 'Enabled debugging');
-    } elsif ($params[0] eq 'nodebug') {
-        $debug = 0;
-        foreach (@grabbers, @getters) {
-            $_->setdebug(0);
+    } elsif ($linestart =~ m|/videosite set (\w+) (\w+)$|) {
+        my $module = $1;
+        my $param = $2;
+
+        foreach my $p (@getters, @grabbers) {
+            if ($p->{'NAME'} eq $module) {
+                @matches = $p->getparamvalues($param, $word);
+                last;
+            }
         }
-        write_irssi(undef, 'Disabled debugging');
+    }
+
+
+    push(@{$complist}, sort @matches);
+    ${$want_space} = 0;
+
+    Irssi::signal_stop();
+}
+
+sub cmdhandler {
+    my ($data, $server, $item) = @_;
+    my ($cmd, @params) = split(/\s+/, $data);
+
+    if (exists($videosite_commands->{$cmd})) {
+        $videosite_commands->{$cmd}->(@params);
     }
 }
 
-unshift(@INC, $plugindir);
+unshift(@INC, $scriptdir);
 init_videosite(1);