remove extra check

[videosite.git] / videosite.pl

diff --git a/videosite.pl b/videosite.pl
index 2b97918..8f56fa1 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' => '',
@@ -292,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;
@@ -346,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});
@@ -444,21 +445,40 @@ sub sig_complete {
     my @matches;
 
     if ($linestart !~ m|^/videosite\b|) {
-        write_irssi(undef, "No concern");
         return;
     }
 
     if ('/videosite' eq $linestart) {
         # No command enterd so far. Produce a list of possible follow-ups
-        @matches = sort grep {/^$word/} keys (%{$videosite_commands});
+        @matches = grep {/^$word/} keys (%{$videosite_commands});
     } elsif ('/videosite set' eq $linestart) {
         # 'set' command entered. Produce a list of modules
         foreach (@grabbers, @getters) {
             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;
+            }
+        }
+    } 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;
+            }
+        }
     }
 
-    push(@{$complist}, @matches);
+
+    push(@{$complist}, sort @matches);
     ${$want_space} = 0;
 
     Irssi::signal_stop();
@@ -473,5 +493,5 @@ sub cmdhandler {
     }
 }
 
-unshift(@INC, $plugindir);
+unshift(@INC, $scriptdir);
 init_videosite(1);