X-Git-Url: https://git.camperquake.de/gitweb.cgi?a=blobdiff_plain;f=videosite.pl;h=8f56fa1605c0ccf23063343e6aeb096ca2d9da08;hb=b8b430497f9015b88686d189838d30267f1c6ac2;hp=fe94079491b189285675eb4177f9465600b530e0;hpb=9cfabbf047871e6671aca65e9313cb4f2ce23124;p=videosite.git diff --git a/videosite.pl b/videosite.pl index fe94079..8f56fa1 100644 --- 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 = @_; @@ -72,6 +130,7 @@ sub check_for_link { my $message = ($parammessage == -1) ? '' : $signal->[$parammessage]; my $g; my $m; + my $p; my $witem; @@ -86,9 +145,12 @@ sub check_for_link { return; } + study($message); + # Offer the message to all Grabbers in turn foreach $g (@grabbers) { - if (defined($m = $g->get($message))) { + ($m, $p) = $g->get($message); + while (defined($m)) { write_debug($witem, 'Metadata: %s', Dumper($m)); if ('download' eq ($conf->{'videosite'}->{'mode'})) { write_irssi($witem, '%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'}); @@ -100,6 +162,13 @@ sub check_for_link { } else { write_irssi($witem, '%%R>>> Invalid operation mode'); } + + # Remove the matched part from the message and try again (there may be + # more!) + $message =~ s/$p//; + study($message); + + ($m, $p) = $g->get($message); } } } @@ -224,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; @@ -278,15 +347,15 @@ 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_debug(undef, "Failed to load plugin: $@"); + write_irssi(undef, "Failed to load plugin: $@"); next; } - $g = eval $p.q{->new();}; + $g = eval qq{ videosite::$p->new(); }; if ($@) { - write_debug(undef, "Failed to instanciate: $@"); + write_irssi(undef, "Failed to instanciate: $@"); delete($INC{$p}); next; } @@ -294,6 +363,7 @@ sub ploader { write_debug(undef, "found $g->{'TYPE'} $g->{'NAME'}"); if ($type eq $g->{'TYPE'}) { push(@g, $g); + $g->setio(sub {Irssi::print(shift)}); } else { write_irssi(undef, '%s has wrong type (got %s, expected %s)', $p, $g->{'TYPE'}, $type); delete($INC{$p}); @@ -370,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);