- Implement the outputstack

- eventify the /videosite command

diff --git a/videosite.pl b/videosite.pl
index ec65194..3f3b086 100644 (file)
--- a/videosite.pl
+++ b/videosite.pl
@@ -24,6 +24,7 @@ my $conf;
 my $conffile = File::Spec->catfile(Irssi::get_irssi_dir(), 'videosite.xml');
 my $scriptdir = File::Spec->catfile(Irssi::get_irssi_dir(), 'scripts');
 my $plugindir = File::Spec->catfile($scriptdir, 'videosite');
+my @outputstack = (undef);
 
 my $PARAMS = {
     'getter' => '',
@@ -52,6 +53,16 @@ signal_add_last(_bcs("message irc own_action" => sub {check_for_link(@_)}));
 # For tab completion
 signal_add_first('complete word', \&sig_complete);
 
+sub push_output {
+    unshift(@putputstack, shift);
+}
+
+sub pop_output {
+    shift(@outputstack);
+
+    unless(@outputstack) @outputstack = (undef);
+}
+
 my $videosite_commands = {
     'save' => sub {
         cmd_save();
@@ -94,7 +105,7 @@ my $videosite_commands = {
         foreach (@grabbers, @getters) {
             $_->setdebug(1);
         }
-        write_irssi(undef, 'Enabled debugging');
+        write_irssi('Enabled debugging');
     },
 
     'nodebug' => sub {
@@ -102,32 +113,35 @@ my $videosite_commands = {
         foreach (@grabbers, @getters) {
             $_->setdebug(0);
         }
-        write_irssi(undef, 'Disabled debugging');
+        write_irssi('Disabled debugging');
     },
 };
 
 sub write_irssi {
-    my $witem = shift;
     my @text = @_;
+    my $output = $outputstack[0];
+
+    my $format = "%%mvideosite: %%n" . shift(@text);
 
-    $text[0] = 'videosite: ' . $text[0];
+    # escape % in parameters from irssi
+    s/%/%%/g foreach @text;
 
-    if (defined $witem) {
-        $witem->print(sprintf(shift(@text), @text), MSGLEVEL_CLIENTCRAP);
+    if (defined $output) {
+        $output->(sprintf($format, @text), MSGLEVEL_CLIENTCRAP);
     } else {
-        Irssi::print(sprintf(shift(@text), @text));
+        Irssi::print(sprintf($format, @text));
     }
 
 }
 
 sub write_debug {
     if ($debug) {
-        write_irssi(shift, @_);
+        write_irssi(@_);
     }
 }
 
 sub check_for_link {
-    by $event = shift;
+    my $event = shift;
     my $message = $event->message();
     my $witem = $event->channel();
     my $g;
@@ -146,16 +160,16 @@ sub check_for_link {
     foreach $g (@grabbers) {
         ($m, $p) = $g->get($message);
         while (defined($m)) {
-            write_debug($witem, 'Metadata: %s', Dumper($m));
+            write_debug('Metadata: %s', Dumper($m));
             if ('download' eq ($conf->{'videosite'}->{'mode'})) {
-                write_irssi($witem, '%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
+                write_irssi('%%R>>> %%NSaving %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
                 unless($getter->get($m)) {
-                    write_irssi($witem, '%%R>>> FAILED');
+                    write_irssi('%%R>>> FAILED');
                 }
             } elsif ('display' eq ($conf->{'videosite'}->{'mode'})) {
-                write_irssi($witem, '%%M>>> %%NSaw %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
+                write_irssi('%%M>>> %%NSaw %%Y%s%%N %%G%s', $m->{'SOURCE'}, $m->{'TITLE'});
             } else {
-                write_irssi($witem, '%%R>>> Invalid operation mode');
+                write_irssi('%%R>>> Invalid operation mode');
             }
 
             # Remove the matched part from the message and try again (there may be
@@ -176,9 +190,9 @@ sub cmd_save {
         close(CONF);
     };
     if ($@) {
-        write_irssi(undef, 'Could not save config to %s: %s', ($conffile, $@));
+        write_irssi('Could not save config to %s: %s', ($conffile, $@));
     } else {
-        write_irssi(undef, 'configuration saved to %s', $conffile);
+        write_irssi('configuration saved to %s', $conffile);
     }
 }
 
@@ -194,7 +208,7 @@ sub cmd_set {
             return;
         }
     }
-    write_irssi(undef, 'No such module');
+    write_irssi('No such module');
 }
 
 
@@ -208,7 +222,7 @@ sub cmd_enable {
             return;
         }
     }
-    write_irssi(undef, 'No such module');
+    write_irssi('No such module');
 }
 
 
@@ -222,7 +236,7 @@ sub cmd_disable {
             return;
         }
     }
-    write_irssi(undef, 'No such module');
+    write_irssi('No such module');
 }
 
 
@@ -234,21 +248,21 @@ sub cmd_show {
     if (defined($target)) {
         foreach $p (@getters, @grabbers) {
             if ($p->{'NAME'} eq $target) {
-                write_irssi(undef, $p->getconfstr());
+                write_irssi($p->getconfstr());
                 return;
             }
         }
-        write_irssi(undef, 'No such module');
+        write_irssi('No such module');
     } else {
-        write_irssi(undef, 'Loaded grabbers (* denotes enabled modules):');
+        write_irssi('Loaded grabbers (* denotes enabled modules):');
         foreach $p (@grabbers) {
             $e = $p->_getval('enabled');
-            write_irssi(undef, ' %s%s', $p->{'NAME'}, $e?'*':'');
+            write_irssi(' %s%s', $p->{'NAME'}, $e?'*':'');
         };
 
-        write_irssi(undef, 'Loaded getters:');
+        write_irssi('Loaded getters:');
         foreach $p (@getters) {
-            write_irssi(undef, ' %s', $p->{'NAME'});
+            write_irssi(' %s', $p->{'NAME'});
         };
     }
 }
@@ -260,13 +274,13 @@ sub cmd_help {
     if (defined($target)) {
         foreach $p (@getters, @grabbers) {
             if ($p->{'NAME'} eq $target) {
-                write_irssi(undef, $p->gethelpstr());
+                write_irssi($p->gethelpstr());
                 return;
             }
         }
-        write_irssi(undef, 'No such module');
+        write_irssi('No such module');
     } else {
-        write_irssi(undef, <<'EOT');
+        write_irssi(<<'EOT');
 Supported commands:
  save: save the current configuration
  help [modulename]: display this help, or module specific help
@@ -295,9 +309,9 @@ sub cmd_getter {
                 return;
             }
         }
-        write_irssi(undef, 'No such getter');
+        write_irssi('No such getter');
     } else {
-        write_irssi(undef, 'Current getter: %s', $conf->{'videosite'}->{'getter'});
+        write_irssi('Current getter: %s', $conf->{'videosite'}->{'getter'});
     }
 }
 
@@ -309,10 +323,10 @@ sub cmd_mode {
         if (('download' eq $mode) or ('display' eq $mode)) {
             $conf->{'videosite'}->{'mode'} = $mode;
         } else {
-            write_irssi(undef, 'Invalid mode: %s', $mode);
+            write_irssi('Invalid mode: %s', $mode);
         }
     } else {
-        write_irssi(undef, 'Current mode: %s', $conf->{'videosite'}->{'mode'});
+        write_irssi('Current mode: %s', $conf->{'videosite'}->{'mode'});
     }
 }
 
@@ -340,32 +354,32 @@ sub ploader {
     closedir(D);
 
     foreach $p (@list) {
-        write_debug(undef, "Trying to load $p:");
+        write_debug("Trying to load $p:");
         $p =~ s/\.pm$//;
         eval qq{ require videosite::$p; };
         if ($@) {
-            write_irssi(undef, "Failed to load plugin: $@");
+            write_irssi("Failed to load plugin: $@");
             next;
         }
 
         $g = eval qq{ videosite::$p->new(); };
         if ($@) {
-            write_irssi(undef, "Failed to instanciate: $@");
+            write_irssi("Failed to instanciate: $@");
             delete($INC{$p});
             next;
         }
 
-        write_debug(undef, "found $g->{'TYPE'} $g->{'NAME'}");
+        write_debug("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);
+            write_irssi('%s has wrong type (got %s, expected %s)', $p, $g->{'TYPE'}, $type);
             delete($INC{$p});
         }
     }
 
-    write_debug(undef, "Loaded %d plugins", $#g+1);
+    write_debug("Loaded %d plugins", $#g+1);
     
     return @g;
 }
@@ -376,7 +390,7 @@ sub _load_modules($) {
 
     foreach (keys(%INC)) {
         if ($INC{$_} =~ m|^$path|) {
-            write_debug(undef, "Removing %s from \$INC", $_);
+            write_debug("Removing %s from \$INC", $_);
             delete($INC{$_});
         }
     }
@@ -392,7 +406,7 @@ sub init_videosite {
 
     unless(-r $conffile && defined($conf = XML::Simple::XMLin($conffile, ForceArray => ['config', 'option'], KeepRoot => 1, KeyAttr => {'config' => 'module', 'option' => 'key'}))) {
         # No config, start with an empty one
-        write_debug(undef, 'No config found, using defaults');
+        write_debug('No config found, using defaults');
         $conf = { 'videosite' => { }};
     }
     foreach (keys(%{$PARAMS})) {
@@ -404,7 +418,7 @@ sub init_videosite {
     _load_modules($plugindir);
 
     unless (defined(@grabbers) && defined(@getters)) {
-        write_irssi(undef, 'No grabbers or no getters found, can not proceed.');
+        write_irssi('No grabbers or no getters found, can not proceed.');
         return;
     }
 
@@ -414,7 +428,7 @@ sub init_videosite {
             $getter = $p;
         }
     }
-    write_debug(undef, 'Selected %s as getter', $getter->{'NAME'});
+    write_debug('Selected %s as getter', $getter->{'NAME'});
     $conf->{'videosite'}->{'getter'} = $getter->{'NAME'};
 
     # Loop through all plugins and load the config
@@ -429,10 +443,10 @@ sub init_videosite {
         Irssi::signal_add('setup saved', 'cmd_save');
 
 
-        Irssi::command_bind('videosite' => \&cmdhandler);
+        Irssi::command_bind(_bcb('videosite' => \&cmdhandler));
     }
 
-    write_irssi(undef, 'videosite initialized');
+    write_irssi('videosite initialized');
 }
 
 sub sig_complete {
@@ -480,8 +494,8 @@ sub sig_complete {
 }
 
 sub cmdhandler {
-    my ($data, $server, $item) = @_;
-    my ($cmd, @params) = split(/\s+/, $data);
+    my $event = shift;
+    my ($cmd, @params) = split(/\s+/, $event->message());
 
     if (exists($videosite_commands->{$cmd})) {
         $videosite_commands->{$cmd}->(@params);